[proxy] make uniform use of section labels in the web UI

12 files changed, 372 insertions, 242 deletions

diff --git a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
index 28f6791..bb93bdf 100644
--- a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
+++ b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hydrilla 2.0\n"
 "Report-Msgid-Bugs-To: koszko@koszko.org\n"
-"POT-Creation-Date: 2022-09-28 10:27+0200\n"
+"POT-Creation-Date: 2022-09-29 12:29+0200\n"
 "PO-Revision-Date: 2022-02-12 00:00+0000\n"
 "Last-Translator: Wojtek Kosior <koszko@koszko.org>\n"
 "Language: en_US\n"
@@ -18,67 +18,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: src/hydrilla/builder/build.py:83 src/hydrilla/builder/local_apt.py:117
-#: src/hydrilla/builder/local_apt.py:411
+#: src/hydrilla/builder/build.py:84 src/hydrilla/builder/local_apt.py:123
+#: src/hydrilla/builder/local_apt.py:428
 msgid "couldnt_execute_{}_is_it_installed"
 msgstr "Could not execute '{}'. Is the tool installed and reachable via PATH?"
 
-#: src/hydrilla/builder/build.py:87 src/hydrilla/builder/local_apt.py:121
-#: src/hydrilla/builder/local_apt.py:415
+#: src/hydrilla/builder/build.py:88 src/hydrilla/builder/local_apt.py:127
+#: src/hydrilla/builder/local_apt.py:432
 msgid "command_{}_failed"
 msgstr "The following command finished execution with a non-zero exit status: {}"
 
-#: src/hydrilla/builder/build.py:194
+#: src/hydrilla/builder/build.py:204
 msgid "path_contains_double_dot_{}"
 msgstr ""
 "Attempt to load '{}' which includes a forbidden parent reference ('..') "
 "in the path."
 
-#: src/hydrilla/builder/build.py:201
+#: src/hydrilla/builder/build.py:211
 msgid "loading_{}_outside_package_dir"
 msgstr "Attempt to load '{}' which lies outside package source directory."
 
-#: src/hydrilla/builder/build.py:205
+#: src/hydrilla/builder/build.py:215
 msgid "loading_reserved_index_json"
 msgstr "Attempt to load 'index.json' which is a reserved filename."
 
-#: src/hydrilla/builder/build.py:212
+#: src/hydrilla/builder/build.py:222
 msgid "referenced_file_{}_missing"
 msgstr "Referenced file '{}' is missing."
 
-#: src/hydrilla/builder/build.py:388
+#: src/hydrilla/builder/build.py:413
 msgid "report_spdx_not_in_copyright_list"
 msgstr ""
 "Told to generate 'report.spdx' but 'report.spdx' is not listed among "
 "copyright files. Refusing to proceed."
 
-#: src/hydrilla/builder/build.py:465
+#: src/hydrilla/builder/build.py:490
 msgid "build_package_from_srcdir_to_dstdir"
 msgstr ""
 "Build Hydrilla package from `scrdir` and write the resulting files under "
 "`dstdir`."
 
-#: src/hydrilla/builder/build.py:467
+#: src/hydrilla/builder/build.py:492
 msgid "source_directory_to_build_from"
 msgstr "Source directory to build from."
 
-#: src/hydrilla/builder/build.py:469
+#: src/hydrilla/builder/build.py:494
 msgid "path_instead_of_index_json"
 msgstr ""
 "Path to file to be processed instead of index.json (if not absolute, "
 "resolved relative to srcdir)."
 
-#: src/hydrilla/builder/build.py:471
+#: src/hydrilla/builder/build.py:496
 msgid "path_instead_for_piggyback_files"
 msgstr ""
 "Path to a non-standard directory with foreign packages' archive files to "
 "use."
 
-#: src/hydrilla/builder/build.py:473
+#: src/hydrilla/builder/build.py:498
 msgid "built_package_files_destination"
 msgstr "Destination directory to write built package files to."
 
-#: src/hydrilla/builder/build.py:475
+#: src/hydrilla/builder/build.py:500
 #: src/hydrilla/mitmproxy_launcher/launch.py:59
 #: src/hydrilla/server/serve.py:203 src/hydrilla/server/serve.py:221
 #: src/hydrilla/server/serve.py:261
@@ -92,7 +92,7 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law."
 
-#: src/hydrilla/builder/build.py:476 src/hydrilla/server/serve.py:222
+#: src/hydrilla/builder/build.py:501 src/hydrilla/server/serve.py:222
 #: src/hydrilla/server/serve.py:262
 msgid "version_printing"
 msgstr "Print version information and exit."
@@ -105,29 +105,29 @@ msgstr "## Command's standard output ##"
 msgid "STDERR_OUTPUT_heading"
 msgstr "## Command's standard error output ##"
 
-#: src/hydrilla/builder/local_apt.py:147
+#: src/hydrilla/builder/local_apt.py:156
 msgid "distro_{}_unknown"
 msgstr "Attempt to use an unknown software distribution '{}'."
 
-#: src/hydrilla/builder/local_apt.py:191
+#: src/hydrilla/builder/local_apt.py:200
 msgid "couldnt_import_{}_is_it_installed"
 msgstr ""
 "Could not import '{}'. Is the module installed and visible to this Python"
 " instance?"
 
-#: src/hydrilla/builder/local_apt.py:199
+#: src/hydrilla/builder/local_apt.py:208
 msgid "gpg_couldnt_recv_key_{}"
 msgstr "Could not import PGP key '{}'."
 
-#: src/hydrilla/builder/local_apt.py:314
+#: src/hydrilla/builder/local_apt.py:327
 msgid "apt_install_output_not_understood"
 msgstr "The output of an 'apt-get install' command was not understood."
 
-#: src/hydrilla/builder/local_apt.py:340
+#: src/hydrilla/builder/local_apt.py:353
 msgid "apt_download_gave_bad_filename_{}"
 msgstr "The 'apt-get download' command produced a file with unexpected name '{}'."
 
-#: src/hydrilla/builder/piggybacking.py:105
+#: src/hydrilla/builder/piggybacking.py:110
 msgid "loading_{}_outside_piggybacked_dir"
 msgstr ""
 "Attempt to load '{}' which lies outside piggybacked packages files root "
@@ -221,27 +221,27 @@ msgstr ""
 msgid "web_ui.base.title.haketilo_proxy"
 msgstr "Haketilo"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:275
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:280
 msgid "web_ui.base.nav.home"
 msgstr "Home"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:276
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:281
 msgid "web_ui.base.nav.rules"
 msgstr "Script blocking"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:277
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:282
 msgid "web_ui.base.nav.packages"
 msgstr "Packages"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:278
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:283
 msgid "web_ui.base.nav.libraries"
 msgstr "Libraries"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:279
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:284
 msgid "web_ui.base.nav.repos"
 msgstr "Repositories"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:280
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:285
 msgid "web_ui.base.nav.import"
 msgstr "Import"
 
@@ -271,7 +271,7 @@ msgstr "Select file"
 
 #: src/hydrilla/proxy/web_ui/templates/import.html.jinja:68
 msgid "web_ui.import.install_from_file_button"
-msgstr "Import"
+msgstr "Import from selected file"
 
 #: src/hydrilla/proxy/web_ui/templates/import.html.jinja:75
 msgid "web_ui.import.heading_import_ad_hoc"
@@ -351,97 +351,113 @@ msgstr ""
 "custom logic to them. Haketilo was orignally developed as a browser "
 "extension but has since been made into an HTTP proxy."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:45
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:47
 msgid "web_ui.home.heading.options"
 msgstr "Global options"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:55
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:50
+msgid "web_ui.home.mapping_usage_mode_label"
+msgstr "Package usage mode"
+
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:59
 msgid "web_ui.home.packages_are_used_when_enabled"
 msgstr ""
 "Hektilo is currently configured to only use packages that were explicitly"
 " enabled."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:58
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:62
 msgid "web_ui.home.user_gets_asked_whether_to_enable_package"
 msgstr ""
 "Hektilo is currently configured to ask whenever a package is found that "
 "could be used for the current site."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:62
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:66
 msgid "web_ui.home.packages_are_used_automatically"
 msgstr ""
 "Hektilo is currently configured to automatically use packages that are "
 "available for the current site."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:69
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:73
 msgid "web_ui.home.use_enabled_button"
 msgstr "Use when enabled"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:72
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:76
 msgid "web_ui.home.use_question_button"
 msgstr "Ask whether to use"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:75
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:79
 msgid "web_ui.home.use_auto_button"
 msgstr "Use automatically"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:88
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:86
+msgid "web_ui.home.script_blocking_mode_label"
+msgstr "Default scripts treatment"
+
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:94
 msgid "web_ui.home.scripts_are_allowed_by_default"
 msgstr ""
 "By default Haketilo currently allows JavaScript sent by websites to the "
 "browser to execute."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:91
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:97
 msgid "web_ui.home.scripts_are_blocked_by_default"
 msgstr ""
 "By default Haketilo currently blocks JavaScript sent by websites to the "
 "browser from executing."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:95
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:101
 msgid "web_ui.home.allow_scripts_button"
 msgstr "Allow scripts"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:96
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:102
 msgid "web_ui.home.block_scripts_button"
 msgstr "Block scripts"
 
 #: src/hydrilla/proxy/web_ui/templates/index.html.jinja:113
+msgid "web_ui.home.advanced_features_label"
+msgstr "Advanced features"
+
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:121
 msgid "web_ui.home.user_is_advanced_user"
 msgstr "Interface features for advanced users are currently enabled."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:116
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:124
 msgid "web_ui.home.user_is_simple_user"
 msgstr "Interface features for advanced users are currently disabled."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:123
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:131
 msgid "web_ui.home.user_make_advanced_button"
 msgstr "Enable"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:126
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:134
 msgid "web_ui.home.user_make_simple_button"
 msgstr "Disable"
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:138
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:142
+msgid "web_ui.home.orphans_label"
+msgstr "Orphans"
+
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:148
 msgid "web_ui.home.orphans_to_delete_{mappings}"
 msgstr "Haketilo is holding some unused packages that can be removed ({mappings})."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:142
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:152
 msgid "web_ui.home.orphans_to_delete_exist"
 msgstr "Haketilo is holding some unused libraries that can be removed."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:146
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:156
 msgid "web_ui.home.orphans_to_delete_{mappings}_{resources}"
 msgstr ""
 "Haketilo is holding some unused items that can be removed (packages: "
 "{mappings}; libraries: {resources})."
 
-#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:155
+#: src/hydrilla/proxy/web_ui/templates/index.html.jinja:165
 msgid "web_ui.home.prune_orphans_button"
 msgstr "Prune orphans"
 
 #: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:25
 #: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:30
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:33
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:35
 msgid "web_ui.err.file_installation_error"
 msgstr "Failed to install needed items from repository."
 
@@ -451,27 +467,31 @@ msgstr "This item is required and cannot be uninstalled."
 
 #: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:33
 #: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:34
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:37
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:39
 msgid "web_ui.err.repo_communication_error"
 msgstr "Couldn't communicate with repository."
 
-#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:40
-msgid "web_ui.items.single_version.version_{}"
-msgstr "Version '{}'."
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:38
+msgid "web_ui.items.single_version.version_label"
+msgstr "Version"
+
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:58
+msgid "web_ui.items.single_version.install_uninstall_label"
+msgstr "Installation status"
 
-#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:64
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:65
 msgid "web_ui.items.single_version.retry_install_button"
 msgstr "Retry installation"
 
-#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:68
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:69
 msgid "web_ui.items.single_version.leave_uninstalled_button"
 msgstr "Leave uninstalled"
 
-#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:72
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:73
 msgid "web_ui.items.single_version.install_button"
 msgstr "Install"
 
-#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:74
+#: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:75
 msgid "web_ui.items.single_version.uninstall_button"
 msgstr "Uninstall"
 
@@ -512,22 +532,34 @@ msgid "web_ui.items.single_version.library.install_failed"
 msgstr "Couldn't install this library version."
 
 #: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:46
+msgid "web_ui.items.single_version.library.is_installed"
+msgstr "Library is currently installed."
+
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:50
+msgid "web_ui.items.single_version.library.is_not_installed"
+msgstr "Library is not currently installed."
+
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:54
 msgid "web_ui.items.single_version.library.version_list_heading"
 msgstr "Other available versions of the library"
 
-#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:58
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:64
+msgid "web_ui.items.single_version.library.enabled_label"
+msgstr "Usage status"
+
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:68
 msgid "web_ui.items.single_version.library.item_required"
 msgstr "This library version is required by an enabled package."
 
-#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:63
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:73
 msgid "web_ui.items.single_version.library.item_not_activated"
 msgstr "This library version is not used by any package enabled by the user."
 
-#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:65
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:75
 msgid "web_ui.items.single_version.library.item_will_be_asked_about"
 msgstr "This library version is not used by any package enabled by the user."
 
-#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:68
+#: src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja:78
 msgid "web_ui.items.single_version.library.item_auto_activated"
 msgstr ""
 "This library version is used by some package. The package has not been "
@@ -563,96 +595,112 @@ msgid "web_ui.items.single_version.package.install_failed"
 msgstr "Couldn't install this package version."
 
 #: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:46
+msgid "web_ui.items.single_version.package.is_installed"
+msgstr "Package is currently installed."
+
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:50
+msgid "web_ui.items.single_version.package.is_not_installed"
+msgstr "Package is not currently installed."
+
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:54
 msgid "web_ui.items.single_version.package.version_list_heading"
 msgstr "Other available versions of the package"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:60
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:64
+msgid "web_ui.items.single_version.package.enabled_label"
+msgstr "Usage status"
+
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:70
 msgid "web_ui.items.single_version.unenable_button"
 msgstr "Forget"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:61
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:71
 msgid "web_ui.items.single_version.disable_button"
 msgstr "Disable"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:62
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:72
 msgid "web_ui.items.single_version.enable_button"
 msgstr "Enable"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:71
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:81
 msgid "web_ui.items.single_version.package.item_not_activated"
-msgstr "This package version is not enabled and won't be used."
+msgstr "This package is not enabled. This version won't be used."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:73
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:83
 msgid "web_ui.items.single_version.package.item_will_be_asked_about"
 msgstr ""
-"This package version is not currently enabled. You will be asked whether "
-"to enable it when you visit a website where it can be used."
+"This package is not currently enabled. You will be asked whether to "
+"enable this version of it when you visit a website where it can be used."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:76
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:86
 msgid "web_ui.items.single_version.package.item_auto_activated"
 msgstr ""
 "This package version has not been explicitly enabled but it is going to "
 "be used automatically."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:80
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:90
 msgid "web_ui.items.single_version.package.item_disabled"
 msgstr "All versions of the package have been explicitly disabled by the user."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:84
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:94
 msgid "web_ui.items.single_version.package.item_enabled"
 msgstr "The package has been enabled by the user."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:103
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:109
+msgid "web_ui.items.single_version.package.pinning_label"
+msgstr "Enabled package pinning"
+
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:115
 msgid "web_ui.items.single_version.unpin_button"
 msgstr "Unpin"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:108
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:120
 msgid "web_ui.items.single_version.not_pinned"
 msgstr "The package is not pinned to any version."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:113
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:125
 msgid "web_ui.items.single_version.pinned_repo_local"
 msgstr "The package is pinned to only use locally installed versions."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:116
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:128
 msgid "web_ui.items.single_version.pinned_repo_{}"
 msgstr "The package is pinned to only use versions from repository '{}'."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:127
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:139
 msgid "web_ui.items.single_version.pin_local_repo_button"
 msgstr "Pin to local packages"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:132
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:145
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:144
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:157
 msgid "web_ui.items.single_version.pin_repo_button"
 msgstr "Pin to repository"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:139
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:151
 msgid "web_ui.items.single_version.repin_repo_button"
 msgstr "Pin to this repository"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:153
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:164
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:165
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:176
 msgid "web_ui.items.single_version.pin_ver_button"
 msgstr "Pin to this version"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:156
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:168
 msgid "web_ui.items.single_version.pinned_ver"
 msgstr "The package is pinned to this version."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:159
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:171
 msgid "web_ui.items.single_version.repin_ver_button"
 msgstr "Pin to this version"
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:161
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:173
 msgid "web_ui.items.single_version.pinned_other_ver"
 msgstr "The package is pinned to a different version."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:169
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:181
 msgid "web_ui.items.single_version.active_ver_is_this_one"
 msgstr "This is the currently active version."
 
-#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:173
+#: src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja:185
 msgid "web_ui.items.single_version.active_ver_is_{}"
 msgstr "Currently active version is '{}'."
 
@@ -737,12 +785,12 @@ msgid "web_ui.repos.add.name_field_label"
 msgstr "Name"
 
 #: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:30
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:67
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:68
 msgid "web_ui.err.repo_name_invalid"
 msgstr "Chosen name is not valid."
 
 #: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:33
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:71
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:72
 msgid "web_ui.err.repo_name_taken"
 msgstr "Chosen name is already in use."
 
@@ -751,7 +799,7 @@ msgid "web_ui.repos.add.url_field_label"
 msgstr "URL"
 
 #: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:39
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:121
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:116
 msgid "web_ui.err.repo_url_invalid"
 msgstr "Chosen URL is not vald."
 
@@ -781,7 +829,7 @@ msgid "web_ui.repos.package_count_{}"
 msgstr "packages: {}"
 
 #: src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja:76
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:45
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:47
 msgid "web_ui.repos.local_packages_semirepo"
 msgstr "Local items"
 
@@ -789,74 +837,86 @@ msgstr "Local items"
 msgid "web_ui.repos.single.title"
 msgstr "Repository view"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:41
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:43
 msgid "web_ui.err.repo_api_version_unsupported"
 msgstr ""
 "Repository uses an unsupported API version. You might need to update "
 "Haketilo."
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:48
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:50
 msgid "web_ui.repos.single.heading.name_{}"
 msgstr "Repository '{}'"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:60
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:53
+msgid "web_ui.repos.single.name_label"
+msgstr "Name"
+
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:59
 msgid "web_ui.repos.single.update_name_button"
 msgstr "Change name"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:80
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:82
+msgid "web_ui.repos.single.no_update_name_button"
+msgstr "Cancel"
+
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:86
 msgid "web_ui.repos.single.commit_update_name_button"
 msgstr "Set new name"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:85
-msgid "web_ui.repos.single.abort_update_name_button"
-msgstr "Cancel"
-
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:96
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:97
 msgid "web_ui.repos.single.repo_is_deleted"
 msgstr ""
 "This repository has been deleted but you're still holding packages that "
 "came from it."
 
 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:102
-msgid "web_ui.repos.single.url_is_{}"
-msgstr "Current URL is '{}'."
+msgid "web_ui.repos.single.url_label"
+msgstr "URL"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:114
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:108
 msgid "web_ui.repos.single.update_url_button"
 msgstr "Change URL"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:130
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:124
+msgid "web_ui.repos.single.no_update_url_button"
+msgstr "Cancel"
+
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:128
 msgid "web_ui.repos.single.commit_update_url_button"
 msgstr "Set new URL"
 
 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:135
-msgid "web_ui.repos.single.abort_update_url_button"
-msgstr "Cancel"
+msgid "web_ui.repos.single.last_refreshed_label"
+msgstr "Last refreshed on"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:145
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:139
 msgid "web_ui.repos.single.repo_never_refreshed"
 msgstr "This repository has not been refreshed yet"
 
 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:148
-msgid "web_ui.repos.single.last_refreshed_{}"
-msgstr "Last refreshed on {}."
-
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:154
-msgid "web_ui.repos.single.refresh_now_button"
-msgstr "Refresh"
+msgid "web_ui.repos.single.stats_label"
+msgstr "Statistics"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:164
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:153
 msgid "web_ui.repos.item_count_{mappings}_{resources}"
 msgstr "packages: {mappings}; libraries: {resources}"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:172
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:161
 msgid "web_ui.repos.item_count_{mappings}"
 msgstr "packages: {mappings}"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:181
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:170
+msgid "web_ui.repos.single.actions_label"
+msgstr "Actions"
+
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:172
 msgid "web_ui.repos.single.remove_button"
 msgstr "Remove repository"
 
+#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:173
+msgid "web_ui.repos.single.refresh_button"
+msgstr "Refresh"
+
 #: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:23
 msgid "web_ui.rules.add.title"
 msgstr "New rule"
@@ -865,28 +925,28 @@ msgstr "New rule"
 msgid "web_ui.rules.add.heading"
 msgstr "Define a new rule"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:29
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:60
-msgid "web_ui.err.rule_pattern_invalid"
-msgstr "Chosen URL pattern is not vald."
-
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:33
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:28
 msgid "web_ui.rules.add.pattern_field_label"
 msgstr "URL pattern"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:43
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:31
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:56
+msgid "web_ui.err.rule_pattern_invalid"
+msgstr "Chosen URL pattern is not vald."
+
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:36
 msgid "web_ui.rules.add.block_or_allow_label"
 msgstr "Page's JavaScript treatment"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:48
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:40
 msgid "web_ui.rules.add.block_label"
 msgstr "block"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:53
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:45
 msgid "web_ui.rules.add.allow_label"
 msgstr "allow"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:60
+#: src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja:52
 msgid "web_ui.rules.add.submit_button"
 msgstr "Add rule"
 
@@ -910,38 +970,46 @@ msgstr "Defined rules"
 msgid "web_ui.rules.single.title"
 msgstr "Rule view"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:34
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:36
 msgid "web_ui.rules.single.heading.allow"
 msgstr "Script allowing rule"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:36
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:38
 msgid "web_ui.rules.single.heading.block"
 msgstr "Script blocking rule"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:41
-msgid "web_ui.rules.single.pattern_is_{}"
-msgstr "Rule applies to all pages that match pattern '{}'."
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:42
+msgid "web_ui.rules.single.pattern_label"
+msgstr "URL pattern"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:53
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:48
 msgid "web_ui.rules.single.update_pattern_button"
 msgstr "Change URL pattern"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:69
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:66
+msgid "web_ui.rules.single.no_update_pattern_button"
+msgstr "Cancel"
+
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:70
 msgid "web_ui.rules.single.commit_update_pattern_button"
 msgstr "Set new pattern"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:74
-msgid "web_ui.rules.single.abort_update_pattern_button"
-msgstr "Cancel"
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:77
+msgid "web_ui.rules.single.block_or_allow_label"
+msgstr "Rule function"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:84
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:82
 msgid "web_ui.rules.single.allow_button"
 msgstr "Allow JavaScript"
 
-#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:85
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:83
 msgid "web_ui.rules.single.block_button"
 msgstr "Block JavaScript"
 
+#: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:101
+msgid "web_ui.rules.single.actions_label"
+msgstr "Actions"
+
 #: src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja:103
 msgid "web_ui.rules.single.remove_button"
 msgstr "Remove rule"
diff --git a/src/hydrilla/proxy/web_ui/templates/base.html.jinja b/src/hydrilla/proxy/web_ui/templates/base.html.jinja
index eb9cb57..266e448 100644
--- a/src/hydrilla/proxy/web_ui/templates/base.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/base.html.jinja
@@ -62,9 +62,9 @@ code in a proprietary work, I am not going to enforce this in court.
   </aside>
 {% endmacro %}
 
-{% macro form_label(label_text, label_name=none) %}
+{% macro label(label_text, label_name=none) %}
   {% set for_attr = label_name and (label_name + "_field") %}
-  <label {{ {'for': for_attr, 'class': 'block-with-bottom-margin'}|xmlattr }}>
+  <label {{ {'for': for_attr, 'class': 'section-label'}|xmlattr }}>
     {{ label_text }}
   </label>
 {% endmacro %}
@@ -134,11 +134,16 @@ code in a proprietary work, I am not going to enforce this in court.
               margin-top: 10px;
           }
 
-          .block-with-bottom-margin, .flex-row, aside, p {
+          .block-with-bottom-margin, .section-label, .flex-row, aside, p {
               display: block;
               margin: 0 0 10px 0;
           }
 
+          .section-label {
+              font-style: italic;
+              text-decoration: underline #ccc;
+          }
+
           .flex-row {
               display: flex;
               padding: 0;
diff --git a/src/hydrilla/proxy/web_ui/templates/import.html.jinja b/src/hydrilla/proxy/web_ui/templates/import.html.jinja
index a8f16a4..7636b77 100644
--- a/src/hydrilla/proxy/web_ui/templates/import.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/import.html.jinja
@@ -81,34 +81,34 @@ code in a proprietary work, I am not going to enforce this in court.
   <form method="POST">
     <input name="action" type="hidden" value="import_ad_hoc">
 
-    {{ form_label(_('web_ui.import.identifier_field_label'), 'identifier') }}
+    {{ label(_('web_ui.import.identifier_field_label'), 'identifier') }}
     {% if invalid_ad_hoc_identifier is defined %}
       {{ error_note(_('web_ui.err.invalid_ad_hoc_identifier')) }}
     {% endif %}
     {{ form_field('identifier') }}
 
-    {{ form_label(_('web_ui.import.long_name_field_label'), 'long_name') }}
+    {{ label(_('web_ui.import.long_name_field_label'), 'long_name') }}
     {{ form_field('long_name', required=false) }}
 
-    {{ form_label(_('web_ui.import.version_field_label'), 'version') }}
+    {{ label(_('web_ui.import.version_field_label'), 'version') }}
     {% if invalid_ad_hoc_version is defined %}
       {{ error_note(_('web_ui.err.invalid_ad_hoc_version')) }}
     {% endif %}
     {{ form_field('version', required=false) }}
 
-    {{ form_label(_('web_ui.import.description_field_label'), 'description') }}
+    {{ label(_('web_ui.import.description_field_label'), 'description') }}
     {{ form_field('description', required=false, height=3) }}
 
-    {{ form_label(_('web_ui.import.patterns_field_label'), 'patterns') }}
+    {{ label(_('web_ui.import.patterns_field_label'), 'patterns') }}
     {% if invalid_ad_hoc_patterns is defined %}
       {{ error_note(_('web_ui.err.invalid_ad_hoc_patterns')) }}
     {% endif %}
     {{ form_field('patterns', height=3) }}
 
-    {{ form_label(_('web_ui.import.script_text_field_label'), 'script_text') }}
+    {{ label(_('web_ui.import.script_text_field_label'), 'script_text') }}
     {{ form_field('script_text', required=false, height=15) }}
 
-    {{ form_label(_('web_ui.import.lic_text_field_label'), 'license_text') }}
+    {{ label(_('web_ui.import.lic_text_field_label'), 'license_text') }}
     {{ form_field('license_text', required=false, height=10) }}
 
     <div class="flex-row">
diff --git a/src/hydrilla/proxy/web_ui/templates/import/checkbox_tricks.html.jinja b/src/hydrilla/proxy/web_ui/templates/import/checkbox_tricks.html.jinja
new file mode 100644
index 0000000..999208b
--- /dev/null
+++ b/src/hydrilla/proxy/web_ui/templates/import/checkbox_tricks.html.jinja
@@ -0,0 +1,35 @@
+{#
+SPDX-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0
+
+Proxy web UI reusable macros for checkbox-based dynamically displayed elements.
+
+This file is part of Hydrilla&Haketilo.
+
+Copyright (C) 2022 Wojtek Kosior
+
+Dual licensed under
+* GNU General Public License v3.0 or later and
+* Creative Commons Attribution Share Alike 4.0 International.
+
+You can choose to use either of these licenses or both.
+
+
+I, Wojtek Kosior, thereby promise not to sue for violation of this
+file's licenses. Although I request that you do not make use of this
+code in a proprietary work, I am not going to enforce this in court.
+#}
+
+{% macro hider_id(name) -%}
+  {{ name }}_chbx
+{%- endmacro %}
+
+{% macro sibling_hider(button_text, name, initial_show=false) %}
+  {% set attrs = {'type': 'checkbox', 'class': 'chbx-tricks-show-hide'} %}
+  {% do attrs.update({'id': hider_id(name)}) %}
+  {% do attrs.update({'checked': none if initial_show else ''}) %}
+  <input {{ attrs|xmlattr }}>
+  <label for="{{ hider_id(name) }}"
+         class="green-button block-with-bottom-margin">
+    {{ button_text }}
+  </label>
+{% endmacro %}
diff --git a/src/hydrilla/proxy/web_ui/templates/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/index.html.jinja
index ce77b24..f05cf4a 100644
--- a/src/hydrilla/proxy/web_ui/templates/index.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/index.html.jinja
@@ -47,6 +47,8 @@ code in a proprietary work, I am not going to enforce this in court.
     {{ _('web_ui.home.heading.options') }}
   </h4>
 
+  {{ label(_('web_ui.home.mapping_usage_mode_label')) }}
+
   {% set use_enabled_but_classes  = ['green-button'] %}
   {% set use_auto_but_classes     = ['green-button'] %}
   {% set use_question_but_classes = ['green-button'] %}
@@ -81,6 +83,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.home.script_blocking_mode_label')) }}
+
   {% set allow_but_classes = ['red-button'] %}
   {% set block_but_classes = ['blue-button'] %}
 
@@ -106,6 +110,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.home.advanced_features_label')) }}
+
   {% set advanced_user_but_classes = ['red-button'] %}
   {% set simple_user_but_classes   = ['blue-button'] %}
 
@@ -133,6 +139,8 @@ code in a proprietary work, I am not going to enforce this in court.
   {% if orphan_item_stats.mappings > 0 or orphan_item_stats.resources > 0 %}
     <div class="horizontal-separator"></div>
 
+    {{ label(_('web_ui.home.orphans_label')) }}
+
     <p>
       {% if settings.advanced_user %}
         {% if orphan_item_stats.mappings > 0 %}
diff --git a/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
index a1056b1..c7574f1 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
@@ -35,11 +35,10 @@ code in a proprietary work, I am not going to enforce this in court.
 
   {{ super() }}
 
+  {{ label(_('web_ui.items.single_version.version_label')) }}
+
   <p>
-    {{
-      _('web_ui.items.single_version.version_{}')
-            .format(versioned_identifier_with_repo(version_display_info))
-    }}
+    {{ versioned_identifier_with_repo(version_display_info) }}
   </p>
 
   <div class="horizontal-separator"></div>
@@ -56,6 +55,8 @@ code in a proprietary work, I am not going to enforce this in court.
   %}
     <div class="horizontal-separator"></div>
 
+    {{ label(_('web_ui.items.single_version.install_uninstall_label')) }}
+
     {% set install_but_classes   = ['green-button'] %}
     {% set uninstall_but_classes = ['green-button'] %}
     {% if version_display_info.installed == InstalledStatus.FAILED_TO_INSTALL %}
@@ -67,7 +68,7 @@ code in a proprietary work, I am not going to enforce this in court.
         set uninstall_text =
             _('web_ui.items.single_version.leave_uninstalled_button')
       %}
-      <div>{% block item_install_failed_msg required %}{% endblock %}</div>
+      <p>{% block item_install_failed_msg required %}{% endblock %}</p>
     {% else %}
       {% set install_text   = _('web_ui.items.single_version.install_button') %}
       {%
@@ -81,9 +82,11 @@ code in a proprietary work, I am not going to enforce this in court.
         %}
           {% do uninstall_but_classes.append('disabled-button') %}
         {% endif %}
+        <p>{% block item_is_installed_msg required %}{% endblock %}</p>
       {% else %}
         {# version_display_info.installed == InstalledStatus.NOT_INSTALLED #}
         {% do uninstall_but_classes.append('disabled-button') %}
+        <p>{% block item_is_not_installed_msg required %}{% endblock %}</p>
       {% endif %}
     {% endif %}{# else/ version_display_info.installed == InstalledStatus.... #}
 
diff --git a/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
index 13ee41a..0454391 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
@@ -42,6 +42,14 @@ code in a proprietary work, I am not going to enforce this in court.
   {{ _('web_ui.items.single_version.library.install_failed') }}
 {% endblock %}
 
+{% block item_is_installed_msg %}
+  {{ _('web_ui.items.single_version.library.is_installed') }}
+{% endblock %}
+
+{% block item_is_not_installed_msg %}
+  {{ _('web_ui.items.single_version.library.is_not_installed') }}
+{% endblock %}
+
 {% block version_list_heading %}
   {{ _('web_ui.items.single_version.library.version_list_heading') }}
 {% endblock %}
@@ -53,6 +61,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.items.single_version.library.enabled_label')) }}
+
   <p>
     {% if version_display_info.active == ActiveStatus.REQUIRED %}
       {{ _('web_ui.items.single_version.library.item_required') }}
diff --git a/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
index 31f5e2e..699469e 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
@@ -42,6 +42,14 @@ code in a proprietary work, I am not going to enforce this in court.
   {{ _('web_ui.items.single_version.package.install_failed') }}
 {% endblock %}
 
+{% block item_is_installed_msg %}
+  {{ _('web_ui.items.single_version.package.is_installed') }}
+{% endblock %}
+
+{% block item_is_not_installed_msg %}
+  {{ _('web_ui.items.single_version.package.is_not_installed') }}
+{% endblock %}
+
 {% block version_list_heading %}
   {{ _('web_ui.items.single_version.package.version_list_heading') }}
 {% endblock %}
@@ -53,6 +61,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.items.single_version.package.enabled_label')) }}
+
   {% set enable_but_classes = ['blue-button'] %}
   {% set unenable_but_classes = ['green-button'] %}
   {% set disable_but_classes = ['red-button'] %}
@@ -96,6 +106,8 @@ code in a proprietary work, I am not going to enforce this in court.
   {% if display_info.enabled == EnabledStatus.ENABLED %}
     <div class="horizontal-separator"></div>
 
+    {{ label(_('web_ui.items.single_version.package.pinning_label')) }}
+
     {% set unpin_but_classes = ['green-button'] %}
     {% set pin_repo_but_classes = ['green-button'] %}
     {% set pin_ver_but_classes = ['green-button'] %}
diff --git a/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja
index be4933a..f635444 100644
--- a/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja
@@ -25,7 +25,7 @@ code in a proprietary work, I am not going to enforce this in court.
 {% block main %}
   <h3>{{ _('web_ui.repos.add.heading') }}</h3>
   <form method="POST">
-    {{ form_label(_('web_ui.repos.add.name_field_label'), 'name') }}
+    {{ label(_('web_ui.repos.add.name_field_label'), 'name') }}
     {% if repo_name_invalid is defined %}
       {{ error_note(_('web_ui.err.repo_name_invalid')) }}
     {% endif %}
@@ -34,7 +34,7 @@ code in a proprietary work, I am not going to enforce this in court.
     {% endif %}
     {{ form_field('name') }}
 
-    {{ form_label(_('web_ui.repos.add.url_field_label'), 'url') }}
+    {{ label(_('web_ui.repos.add.url_field_label'), 'url') }}
     {% if repo_url_invalid is defined %}
       {{ error_note(_('web_ui.err.repo_url_invalid')) }}
     {% endif %}
diff --git a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
index d2c85df..04075c4 100644
--- a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
@@ -28,6 +28,8 @@ code in a proprietary work, I am not going to enforce this in court.
   {% include 'include/checkbox_tricks_style.css.jinja' %}
 {% endblock %}
 
+{% import 'import/checkbox_tricks.html.jinja' as tricks %}
+
 {% block main %}
   {% if file_installation_error is defined %}
     {{ error_note(_('web_ui.err.file_installation_error')) }}
@@ -47,18 +49,17 @@ code in a proprietary work, I am not going to enforce this in court.
     <h3>
       {{ _('web_ui.repos.single.heading.name_{}').format(display_info.name) }}
     </h3>
-    {% if repo_name_invalid is defined or repo_name_taken is defined %}
-      {% set checked_attr = '' %}
-    {% else %}
-      {% set checked_attr = 'checked=""' %}
-    {% endif %}
     {% if not display_info.deleted %}
-      <input id="hide_name_edit_form" type="checkbox"
-             class="chbx-tricks-show-hide" {{ checked_attr }}>
-      <label for="hide_name_edit_form"
-             class="green-button block-with-bottom-margin">
-        {{ _('web_ui.repos.single.update_name_button') }}
-      </label>
+      {{ label(_('web_ui.repos.single.name_label')) }}
+
+      <p>
+        {{ display_info.name }}
+      </p>
+
+      {% set button_text = _('web_ui.repos.single.update_name_button') %}
+      {% set initial_show = repo_name_invalid is defined %}
+      {% set initial_show = initial_show or repo_name_taken is defined %}
+      {{ tricks.sibling_hider(button_text, 'edit_name', initial_show) }}
 
       <form method="POST">
         <input type="hidden" name="action" value="update_repo_data">
@@ -76,14 +77,14 @@ code in a proprietary work, I am not going to enforce this in court.
         </div>
 
         <div class="flex-row">
-          <button class="green-button button-bordering-right">
+          <label for="{{ tricks.hider_id('edit_name') }}"
+                 class="red-button button-brodering-right">
+            {{ _('web_ui.repos.single.no_update_name_button') }}
+          </label>
+          <div class="button-row-separator"></div>
+          <button class="green-button button-bordering-left">
             {{ _('web_ui.repos.single.commit_update_name_button') }}
           </button>
-          <div class="button-row-separator"></div>
-          <label for="hide_name_edit_form"
-                 class="green-button button-bordering-left">
-            {{ _('web_ui.repos.single.abort_update_name_button') }}
-          </label>
         </div>
       </form>
 
@@ -98,21 +99,15 @@ code in a proprietary work, I am not going to enforce this in court.
 
     <div class="horizontal-separator"></div>
   {% elif not display_info.deleted %}
+    {{ label(_('web_ui.repos.single.url_label')) }}
+
     <p>
-      {{ _('web_ui.repos.single.url_is_{}').format(display_info.url) }}
+      {{ display_info.url }}
     </p>
 
-    {% if repo_url_invalid is defined %}
-      {% set checked_attr = '' %}
-    {% else %}
-      {% set checked_attr = 'checked=""' %}
-    {% endif %}
-    <input id="hide_url_edit_form" type="checkbox" class="chbx-tricks-show-hide"
-            {{ checked_attr }}>
-    <label for="hide_url_edit_form"
-           class="green-button block-with-bottom-margin">
-      {{ _('web_ui.repos.single.update_url_button') }}
-    </label>
+    {% set button_text = _('web_ui.repos.single.update_url_button') %}
+    {% set initial_show = repo_url_invalid is defined %}
+    {{ tricks.sibling_hider(button_text, 'edit_url', initial_show) }}
 
     <form method="POST">
       <input type="hidden" name="action" value="update_repo_data">
@@ -121,43 +116,37 @@ code in a proprietary work, I am not going to enforce this in court.
           {{ error_note(_('web_ui.err.repo_url_invalid')) }}
       {% endif %}
 
-      <div class="flex-row">
-        <input name="url" value="{{ display_info.url }}" required="">
-      </div>
+      {{ form_field('url', sep_after=false) }}
 
       <div class="flex-row">
-        <button class="green-button button-bordering-right">
+        <label for="{{ tricks.hider_id('edit_url') }}"
+               class="red-button button-brodering-right">
+          {{ _('web_ui.repos.single.no_update_url_button') }}
+        </label>
+        <div class="button-row-separator"></div>
+        <button class="green-button button-bordering-left">
           {{ _('web_ui.repos.single.commit_update_url_button') }}
         </button>
-        <div class="button-row-separator"></div>
-        <label for="hide_url_edit_form"
-               class="green-button button-bordering-left">
-          {{ _('web_ui.repos.single.abort_update_url_button') }}
-        </label>
       </div>
     </form>
 
     <div class="horizontal-separator"></div>
 
-    <div>
-      <p>
-        {% if display_info.last_refreshed is none %}
-          {{ _('web_ui.repos.single.repo_never_refreshed') }}
-        {% else %}
-          {{
-            _('web_ui.repos.single.last_refreshed_{}')
-                .format(display_info.last_refreshed.strftime('%F %H:%M'))
-          }}
-        {% endif %}
-      </p>
+    {{ label(_('web_ui.repos.single.last_refreshed_label')) }}
 
-      {% set button_text = _('web_ui.repos.single.refresh_now_button') %}
-      {% set extra_fields = {'action': 'refresh_repo'} %}
-      {{ button_row([(['green-button'], button_text, extra_fields)]) }}
-    </div>
+    <p>
+      {% if display_info.last_refreshed is none %}
+        {{ _('web_ui.repos.single.repo_never_refreshed') }}
+      {% else %}
+        {{ display_info.last_refreshed.strftime('%F %H:%M') }}
+      {% endif %}
+    </p>
 
     <div class="horizontal-separator"></div>
   {% endif %}{# not display_info.deleted (elif) #}
+
+  {{ label(_('web_ui.repos.single.stats_label')) }}
+
   <p>
     {% if settings.advanced_user %}
       {{
@@ -175,11 +164,19 @@ code in a proprietary work, I am not going to enforce this in court.
     {% endif %}
   </p>
 
-  {% if not display_info.is_local_semirepo and not display_info.deleted %}
+  {% if not display_info.deleted %}
     <div class="horizontal-separator"></div>
 
-    {% set button_text = _('web_ui.repos.single.remove_button') %}
-    {% set extra_fields = {'action': 'remove_repo'} %}
-    {{ button_row([(['green-button'], button_text, extra_fields)]) }}
+    {{ label(_('web_ui.repos.single.actions_label')) }}
+
+    {% set remove_text  = _('web_ui.repos.single.remove_button') %}
+    {% set refresh_text = _('web_ui.repos.single.refresh_button') %}
+
+    {{
+      button_row([
+          (['green-button'], refresh_text, {'action': 'refresh_repo'}),
+          (['red-button'], remove_text, {'action': 'remove_repo'})
+      ])
+    }}
   {% endif %}
 {% endblock %}
diff --git a/src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja b/src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja
index 3f7e2a7..430c5ca 100644
--- a/src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/rules/add.html.jinja
@@ -25,23 +25,15 @@ code in a proprietary work, I am not going to enforce this in court.
 {% block main %}
   <h3>{{ _('web_ui.rules.add.heading') }}</h3>
   <form method="POST">
+    {{ label(_('web_ui.rules.add.pattern_field_label'), 'pattern') }}
+
     {% if rule_pattern_invalid is defined %}
       {{ error_note(_('web_ui.err.rule_pattern_invalid')) }}
     {% endif %}
 
-    <label for="pattern_field" class="block-with-bottom-margin">
-      {{ _('web_ui.rules.add.pattern_field_label') }}
-    </label>
-
-    <div class="flex-row">
-      <input id="pattern_field" name="pattern" required="">
-    </div>
-
-    <div class="horizontal-separator"></div>
+    {{ form_field('pattern') }}
 
-    <label class="block-with-bottom-margin">
-      {{ _('web_ui.rules.add.block_or_allow_label') }}
-    </label>
+    {{ label(_('web_ui.rules.add.block_or_allow_label'), 'allow') }}
 
     <div class="block-with-bottom-margin">
       <input id="block_box" name="allow" type="radio" value="false" checked="">
diff --git a/src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja
index 1fda236..9bf2c75 100644
--- a/src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/rules/show_single.html.jinja
@@ -28,6 +28,8 @@ code in a proprietary work, I am not going to enforce this in court.
   {% include 'include/checkbox_tricks_style.css.jinja' %}
 {% endblock %}
 
+{% import 'import/checkbox_tricks.html.jinja' as tricks %}
+
 {% block main %}
   <h3>
     {% if display_info.allow_scripts %}
@@ -37,21 +39,15 @@ code in a proprietary work, I am not going to enforce this in court.
     {% endif %}
   </h3>
 
+  {{ label(_('web_ui.rules.single.pattern_label')) }}
+
   <p>
-    {{ _('web_ui.rules.single.pattern_is_{}').format(display_info.pattern) }}
+    {{ display_info.pattern }}
   </p>
 
-  {% if rule_pattern_invalid is defined %}
-    {% set checked_attr = '' %}
-  {% else %}
-    {% set checked_attr = 'checked=""' %}
-  {% endif %}
-  <input id="hide_pattern_edit_form" type="checkbox"
-         class="chbx-tricks-show-hide" {{ checked_attr }}>
-  <label for="hide_pattern_edit_form"
-         class="green-button block-with-bottom-margin">
-    {{ _('web_ui.rules.single.update_pattern_button') }}
-  </label>
+  {% set button_text = _('web_ui.rules.single.update_pattern_button') %}
+  {% set initial_show = rule_pattern_invalid is defined %}
+  {{ tricks.sibling_hider(button_text, 'edit_pattern', initial_show) }}
 
   <form method="POST">
     <input type="hidden" name="action" value="update_rule_data">
@@ -65,19 +61,21 @@ code in a proprietary work, I am not going to enforce this in court.
     </div>
 
     <div class="flex-row">
-      <button class="green-button button-bordering-right">
+      <label for="{{ tricks.hider_id('edit_pattern') }}"
+             class="red-button button-bordering-right">
+        {{ _('web_ui.rules.single.no_update_pattern_button') }}
+      </label>
+      <div class="button-row-separator"></div>
+      <button class="green-button button-bordering-left">
         {{ _('web_ui.rules.single.commit_update_pattern_button') }}
       </button>
-      <div class="button-row-separator"></div>
-      <label for="hide_pattern_edit_form"
-             class="green-button button-bordering-left">
-        {{ _('web_ui.rules.single.abort_update_pattern_button') }}
-      </label>
     </div>
   </form>
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.rules.single.block_or_allow_label')) }}
+
   {% set allow_but_classes = ['red-button'] %}
   {% set block_but_classes = ['blue-button'] %}
 
@@ -100,6 +98,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.rules.single.actions_label')) }}
+
   {% set button_text = _('web_ui.rules.single.remove_button') %}
   {% set extra_fields = {'action': 'remove_rule'} %}
   {{ button_row([(['green-button'], button_text, extra_fields)]) }}