diff --git a/www/assets/js/toolbox_scanner.js b/www/assets/js/toolbox_scanner.js
index b3171f0..8beb771 100644
--- a/www/assets/js/toolbox_scanner.js
+++ b/www/assets/js/toolbox_scanner.js
@@ -1,4 +1,4 @@
-/* 
+/*
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -170,7 +170,7 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
 
     if ($(this).data("form3849") == "1") {
         // TODO: make this not a hack
-        app.dialog.prompt("Type in 3849 form", "3849 Form", function (formcode) {
+        app.dialog.prompt("Key in 3849 form", "3849 Form", function (formcode) {
             for (i in scannerCodes) {
                 saveScanCode({
                     code: scannerCodes[i],
@@ -181,7 +181,7 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
             }
             app.toast.show({
                 text: 'Information recorded successfully!',
-                position: "bottom",
+                position: "center",
                 destroyOnClose: true,
                 closeTimeout: 1000 * 3
             });
@@ -200,10 +200,16 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
         }
         app.toast.show({
             text: 'Information recorded successfully!',
-            position: "bottom",
+            position: "center",
             destroyOnClose: true,
             closeTimeout: 1000 * 3
         });
         resetScanner();
     }
+});
+
+$("#brokenscannerinput").on('keypress', function (e) {
+    if (e.which == 13) {
+        brokenScannerAddTextEntry();
+    }
 });
\ No newline at end of file
diff --git a/www/pages/toolbox/scanner/entries.html b/www/pages/toolbox/scanner/entries.html
index edc745b..64d517f 100644
--- a/www/pages/toolbox/scanner/entries.html
+++ b/www/pages/toolbox/scanner/entries.html
@@ -23,7 +23,7 @@
 
     <div class="page-content">
         {{#if entries}}
-        <div class="list media-list">
+        <div class="list media-list no-margin-top no-hairlines">
             <ul>
                 {{#each entries}}
                 <li style="padding-top: 2rem; padding-bottom: 2rem;">
diff --git a/www/pages/toolbox/scanner/scanner.html b/www/pages/toolbox/scanner/scanner.html
index a85ace5..e9e0cf4 100644
--- a/www/pages/toolbox/scanner/scanner.html
+++ b/www/pages/toolbox/scanner/scanner.html
@@ -49,9 +49,15 @@
     </div>
 
     <div class="popup" id="scanEventPopup" style="background-color: var(--f7-page-bg-color);">
-        <div class="block">
-            <p>Select Event</p>
-            <div class="list tablet-inset">
+        <div class="navbar">
+            <div class="navbar-bg"></div>
+            <div class="navbar-inner">
+                <div class="title">Select Event</div>
+            </div>
+        </div>
+
+        <div class="block no-margin-top padding-bottom" style="height: calc(100% - var(--f7-navbar-height)); overflow-y: auto;">
+            <div class="list tablet-inset no-hairlines no-margin-top">
                 <ul class="eventlist">
 
                 </ul>
@@ -66,8 +72,15 @@
     </div>
 
     <div class="popup" id="scanEventTypePopup" style="background-color: var(--f7-page-bg-color);">
-        <div class="block">
-            <div class="list tablet-inset">
+        <div class="navbar">
+            <div class="navbar-bg"></div>
+            <div class="navbar-inner">
+                <div class="title">Event Type</div>
+            </div>
+        </div>
+
+        <div class="block no-margin-top padding-bottom" style="height: calc(100% - var(--f7-navbar-height)); overflow-y: auto;">
+            <div class="list tablet-inset no-hairlines no-margin-top">
                 <ul class="eventlist">
 
                 </ul>