diff --git a/web_app/js/sif_tools.js b/web_app/js/sif_tools.js
index c1a1bf6..ae2aa46 100644
--- a/web_app/js/sif_tools.js
+++ b/web_app/js/sif_tools.js
@@ -187,7 +187,7 @@ function setup_ui_elements() {
     $("input[name=card-mode]").change(handle_card_mode_select);
     // set up checkbox change event handler
     $("#gems_include_events").change(function() {
-        handle_gem_event_box(this.checked);
+        update_ui();
     });
     // set up gem event calc note dialog
     // $("#dialog").dialog({ autoOpen: false });
@@ -205,7 +205,7 @@ function setup_ui_elements() {
     });
     // set up show/hide JP-only options
     $("#gem_game_version").on("change", function(e) {
-        handle_gem_game_version_change();
+        update_ui();
     });
     // update the UI based on what is selected
     update_ui();
@@ -254,23 +254,6 @@ function update_ui()
     }
 }
 
-function handle_gem_game_version_change() {
-    var game_version = $("#gem_game_version").val();
-    if (game_version === "JP") {
-        $("#gem_jp_daily_gems").show();
-    } else {
-        $("#gem_jp_daily_gems").hide();
-    }
-}
-
-function handle_gem_event_box(show_it) {
-    if (show_it) {
-        $("#gem-event-options-area").show();
-    } else {
-        $("#gem-event-options-area").hide();
-    }
-}
-
 function setup_button_handlers() {
     $("#button-calculate-rank").click(function(evt) {
         calculate_rank();
@@ -397,6 +380,28 @@ function calculate_rank() {
     }
 }
 
+function handle_gem_mode_select() {
+    var mode = $(this).val();
+    if (mode === "DATE") {
+        $("#gem-date-area").show();
+        $("#gem-desired-gems-area").hide();
+    } else if (mode === "GEMS") {
+        $("#gem-date-area").hide();
+        $("#gem-desired-gems-area").show();
+    }
+}
+
+function handle_card_mode_select() {
+    var mode = $(this).val();
+    if (mode === "LEVEL") {
+        $("#card-level-area").show();
+        $("#card-exp-area").hide();
+    } else if (mode === "EXP") {
+        $("#card-level-area").hide();
+        $("#card-exp-area").show();
+    }
+}
+
 function reset_rank() {
     $("#rank-calc-result-area").hide();
     $("#current_rank").val("");
@@ -411,34 +416,12 @@ function reset_rank() {
     $("#rank-results-fp").text("-");
 }
 
-function handle_gem_mode_select() {
-    var mode = $(this).val();
-    if (mode === "DATE") {
-        $("#gem-date-area").show();
-        $("#gem-desired-gems-area").hide();
-    } else if (mode === "GEMS") {
-        $("#gem-date-area").hide();
-        $("#gem-desired-gems-area").show();
-    }
-}
-
 function card_set_max_level() {
     var rarity = $("#card_rarity").val();
     var level = get_level_cap(rarity);
     $("#card_desired_level").val(level);
 }
 
-function handle_card_mode_select() {
-    var mode = $(this).val();
-    if (mode === "LEVEL") {
-        $("#card-level-area").show();
-        $("#card-exp-area").hide();
-    } else if (mode === "EXP") {
-        $("#card-level-area").hide();
-        $("#card-exp-area").show();
-    }
-}
-
 function is_muse_members_birthday(moment) {
     var the_month = month(moment);
     var the_day = day(moment);
@@ -517,7 +500,7 @@ function is_same_day(m1, m2) {
     return false;
 }
 
-function handle_event(day_of_month, game_version, typical_tier) {
+function calculate_event(day_of_month, game_version, typical_tier) {
     LOG(1, "start event type is " + current_type_of_event);
     // format of returned tuple:
     // tuple[0] - was this an event day? (boolean, duh)
@@ -697,7 +680,7 @@ function calculate_gems() {
                 // tuple[1] - name of event, or "" if none (string)
                 // tuple[2] - amount of gems spent (int)
                 // tuple[3] - amount of gems gained (int)
-                var event_results = handle_event(day(now), game_version, tier);
+                var event_results = calculate_event(day(now), game_version, tier);
                 var is_event = event_results[0];
                 var event_name = "";
                 var spent_gems = 0;
@@ -802,7 +785,7 @@ function calculate_gems() {
                 // tuple[1] - name of event, or "" if none (string)
                 // tuple[2] - amount of gems spent (int)
                 // tuple[3] - amount of gems gained (int)
-                var event_results = handle_event(day(now), game_version, tier);
+                var event_results = calculate_event(day(now), game_version, tier);
                 var is_event = event_results[0];
                 var event_name = "";
                 var spent_gems = 0;
diff --git a/web_app/sif_tools.html b/web_app/sif_tools.html
index ed0c3b9..d20658a 100644
--- a/web_app/sif_tools.html
+++ b/web_app/sif_tools.html
@@ -133,8 +133,8 @@
           </select>
         </div><br>
         Mode:<br>
-        <input type="radio" name="gem-mode" id="gem-mode" value="DATE" checked>Number of gems you'll have on a date?<br>
-        <input type="radio" name="gem-mode" id="gem-mode" value="GEMS">Date you will have this many gems?<br>
+        <input type="radio" name="gem-mode" id="gem-mode" class="option-button" value="DATE" checked>Number of gems you'll have on a date?<br>
+        <input type="radio" name="gem-mode" id="gem-mode" class="option-button" value="GEMS">Date you will have this many gems?<br>
         <br>
         <div id="gem-date-area">
           Date:&nbsp;&nbsp;&nbsp;<input type="text" size="10" id="gem_desired_date" name="gem_desired_date" readonly="true" placeholder="MM/DD/YYYY" value="">
@@ -186,8 +186,8 @@
         ""><br>
         <br>
         Mode:<br>
-        <input type="radio" name="card-mode" id="card-mode" value="LEVEL" checked>EXP needed to get card to a level?<br>
-        <input type="radio" name="card-mode" id="card-mode" value="EXP">Final level after feeding an amount of EXP?<br>
+        <input type="radio" name="card-mode" id="card-mode" class="option-button" value="LEVEL" checked>EXP needed to get card to a level?<br>
+        <input type="radio" name="card-mode" id="card-mode" class="option-button" value="EXP">Final level after feeding an amount of EXP?<br>
         <br>
         <div id="card-level-area">
           Desired level:&nbsp;&nbsp;&nbsp;<input type="text" readonly="true" size="5" id="card_desired_level" name="card_desired_level" placeholder="level"