diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
index e39bf363..36a9f232 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
@@ -397,35 +397,15 @@ message_no_sites=No Sites
 
 # AppData
 loading_app_data=Loading data...
-table_title_app_data=App Data
-label_field_app_data_key=Name
-label_field_app_data_value=Value
-label_field_app_data_enabled=Enabled
-label_field_app_data_expiration=Expiration
+table_title_app_views=App Views
 date_format_app_data_expiration={{E}} {{M}} {{d}}, {{YYYY}}
 message_app_data_no_expiration=None
-label_field_app_data_delete=Delete
-button_label_app_data_enable=Enable
-button_label_app_data_disable=Disable
-button_label_app_data_delete=Delete
 button_label_app_data_delete_icon=fa fa-trash
 message_no_data=No Data
 
 # AppSite
 loading_app_site=Loading site...
-table_title_app_site_data=Site Data
-label_field_app_site_data_key=Name
-label_field_app_site_data_value=Value
-label_field_app_site_data_enabled=Enabled
-label_field_app_site_data_expiration=Expiration
-date_format_app_site_data_expiration={{E}} {{M}} {{d}}, {{YYYY}}
-message_app_site_data_no_expiration=None
-label_field_app_site_data_delete=Delete
-button_label_app_site_data_enable=Enable
-button_label_app_site_data_disable=Disable
-button_label_app_site_data_delete=Delete
-button_label_app_site_data_delete_icon=fa fa-trash
-message_no_site_data=No Site Data
+table_title_app_site_view=App Site Views
 
 # Error messages from API server
 err.accountContactsJson.length=Account contacts length violation
diff --git a/bubble-server/src/main/resources/models/apps/analytics/bubbleApp_analytics.json b/bubble-server/src/main/resources/models/apps/analytics/bubbleApp_analytics.json
index 6f0521ae..2a4bca8c 100644
--- a/bubble-server/src/main/resources/models/apps/analytics/bubbleApp_analytics.json
+++ b/bubble-server/src/main/resources/models/apps/analytics/bubbleApp_analytics.json
@@ -8,7 +8,7 @@
     "driverClass": "bubble.app.analytics.TrafficAnalyticsApp",
     "presentation": "app",
     "fields": ["key", "data"],
-    "params": [{"name": "site"}],
+    "params": [{"name": "site", "required": false}],
     "views": [
       {"name": "most_recent"},
       {"name": "today"},
diff --git a/bubble-server/src/main/resources/models/apps/user_block/bubbleApp_userBlock.json b/bubble-server/src/main/resources/models/apps/user_block/bubbleApp_userBlock.json
index 5755b254..f50a8ac5 100644
--- a/bubble-server/src/main/resources/models/apps/user_block/bubbleApp_userBlock.json
+++ b/bubble-server/src/main/resources/models/apps/user_block/bubbleApp_userBlock.json
@@ -13,7 +13,7 @@
       {"name": "delete"}
     ],
     "views": [
-      {"name": "blocked_users"}
+      {"name": "blocked_users", "presentation": "site"}
     ]
   },
   "children": {
@@ -22,7 +22,7 @@
       "messages": [
         {"name": "name", "value": "User Blocker"},
         {"name": "description", "value": "Throw the garbage to the curb!"},
-        {"name": "view.blocked_users", "value": "Blocked Users"},
+        {"name": "view.blocked_users", "value": "Manage Blocked Users"},
         {"name": "field.key", "value": "Username"},
         {"name": "field.enabled", "value": "Enforce Block"},
         {"name": "action.enable", "value": "Enforce Block"},
diff --git a/bubble-web b/bubble-web
index 75079a27..3ecf6948 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 75079a27bbda0fdf72480e79332be960c4cd0676
+Subproject commit 3ecf6948a71bed8f261ac8b8466126a84d52c59f
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 6e882f24..7a4865ea 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 6e882f2455be7f3d99efd074e198ee881504ad49
+Subproject commit 7a4865ea34548c0be61ebf759672838c085e9781