diff --git a/Vue/app/src/charts/_RevRCC.vue b/Vue/app/src/charts/_RevRCC.vue
index 06acd9e..05e09d9 100644
--- a/Vue/app/src/charts/_RevRCC.vue
+++ b/Vue/app/src/charts/_RevRCC.vue
@@ -80,7 +80,7 @@
                             data:grid_import_variable,
                         },
                         {
-                            name: 'Fixed Grid Import',
+                            name: 'Daily Charge',
                             data:grid_import_fixed,
                         },
                         {
diff --git a/Vue/app/src/pages/inputs/ModelParticipants.vue b/Vue/app/src/pages/inputs/ModelParticipants.vue
index 15c5c4d..9967e19 100644
--- a/Vue/app/src/pages/inputs/ModelParticipants.vue
+++ b/Vue/app/src/pages/inputs/ModelParticipants.vue
@@ -31,7 +31,7 @@
                             {{ header.additional_text }}
                         </td>
                     </tr>
-                    <tr v-for="row in input_data.table_rows" :key="row.row_id">
+                    <tr v-for="(row, index) in input_data.table_rows" :key="row.row_id">
                         <td v-for="input in row.row_inputs" :key="input.col_id">
                             <SimpleNumberInput
                                 v-if="input.tag==='my_number'"
@@ -44,6 +44,7 @@
                         </td>
                         
                         <td><div class="show-data-button" v-on:click="show_chart(row.row_id)">Show Data</div></td>
+                        <td><div class="remove-row-button" v-on:click="remove_row(index);">Remove</div></td>
                     </tr>
                 </table>
 
@@ -162,7 +163,7 @@
 
                         tariff_type_options: [
                             "TOU",
-                            "TOU + Block",
+                            // "TOU + Block",
                         ],
 
                         battery_options: [
@@ -289,6 +290,10 @@
         },
 
         methods: {
+            remove_row(index){
+                this.input_data.table_rows.splice(index,1);
+            },
+            
             auto_fill(){
                 if(this.input_data.selected_load_file != "" && this.input_data.selected_solar_file != ""){
                     var solar_profiles = this.input_data.my_options.solar_profiles_options;
@@ -715,5 +720,14 @@
         margin: 4vh 0 0 0;
     }
 
+    .remove-row-button{
+        font-size: 0.7em;
+        background-color:$button-warning;
+        color:$button-text;
+        border-radius:4px;
+        cursor: pointer;
+        padding: 0 0.5vw 0 0.5vw;
+    }
+
 
 </style>
\ No newline at end of file
diff --git a/Vue/app/src/pages/inputs/ModelTariffs.vue b/Vue/app/src/pages/inputs/ModelTariffs.vue
index 0cf8a7d..f580b0f 100644
--- a/Vue/app/src/pages/inputs/ModelTariffs.vue
+++ b/Vue/app/src/pages/inputs/ModelTariffs.vue
@@ -6,7 +6,7 @@
             
             <div class="container">
                 <div class="container-header">
-                    Retail Tariffs
+                    Retail Component
                 </div>
                 <div class="container-content">
                     <Chart class="mychart" :options="retailChartOptions"></Chart>
@@ -48,7 +48,7 @@
 
             <div class="container">
                 <div class="container-header">
-                    Network Tariffs
+                    Network Component
                 </div>
                 <div class="container-content">
                     <Chart class="mychart" :options="networkChartOptions"></Chart>
@@ -108,13 +108,13 @@
 
             <div class="container">
                 <div class="container-header">
-                    Local Solar
+                    Local Solar Component
                 </div>
                 <div class="container-content">
                     <div class="tariffs">
-                        <div class="input">
+                        <!-- <div class="input">
                             Energy <input v-model="input_data.tariffs.local_solar.energy"/> <span class="units">($/kWh)</span>
-                        </div>
+                        </div> -->
                         <div class="input">
                             Retail <input v-model="input_data.tariffs.local_solar.retail"/> <span class="units">($/kWh)</span>
                         </div>
@@ -124,19 +124,22 @@
                         <div class="input">
                             TUOS <input v-model="input_data.tariffs.local_solar.tuos"/> <span class="units">($/kWh)</span>
                         </div>
+                        <div class="input">
+                            Total: {{total_solar_tariff}}
+                        </div>
                     </div>
                 </div>
             </div>
             <div class="container">
                 <div class="container-header">
-                    Central Battery
+                    Central Battery Component
                 </div>
 
                 <div class="tariffs">
                     
-                    <div class="input">
+                    <!-- <div class="input">
                         Energy <input v-model="input_data.tariffs.central_battery.energy"/> <span class="units">($/kWh)</span>
-                    </div>
+                    </div> -->
                     <div class="input">
                         Retail <input v-model="input_data.tariffs.central_battery.retail"/> <span class="units">($/kWh)</span>
                     </div>
@@ -147,7 +150,7 @@
                         TUOS <input v-model="input_data.tariffs.central_battery.tuos"/> <span class="units">($/kWh)</span>
                     </div>
                     <div class="input">
-                        TUOS <input v-model="input_data.tariffs.central_battery.nuos"/> <span class="units">($/kWh)</span>
+                        NUOS <input v-model="input_data.tariffs.central_battery.nuos"/> <span class="units">($/kWh)</span>
                     </div>
                     <div class="input">
                         Profit <input v-model="input_data.tariffs.central_battery.profit"/> <span class="units">($/kWh)</span>
@@ -156,10 +159,10 @@
                 
                 <div class="container-content">
                     <div class="tariffs">
-                        <div class="tariff-label">Local Solar Import</div>
-                        <div class="input">
+                        <div class="tariff-label">Paid to Local Solar</div>
+                        <!-- <div class="input">
                             Energy <input v-model="input_data.tariffs.central_battery.local_solar_import_energy"/> <span class="units">($/kWh)</span>
-                        </div>
+                        </div> -->
                         <div class="input">
                             Retail <input v-model="input_data.tariffs.central_battery.local_solar_import_retail"/> <span class="units">($/kWh)</span>
                         </div>
@@ -170,7 +173,7 @@
                             TUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_tuos"/> <span class="units">($/kWh)</span>
                         </div>
                         <div class="input">
-                            TUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_nuos"/> <span class="units">($/kWh)</span>
+                            NUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_nuos"/> <span class="units">($/kWh)</span>
                         </div>
                     </div>
 
@@ -328,6 +331,11 @@
 
         computed:{
 
+            total_solar_tariff(){
+                var total = Number(this.input_data.tariffs.local_solar.retail) + Number(this.input_data.tariffs.local_solar.tuos) + Number(this.input_data.tariffs.local_solar.duos);
+                return Number(total).toFixed(2);
+            },
+
             shoulder_1_times(){
                 return {
                     start: this.input_data.tariffs.tou_times[0],
diff --git a/Vue/app/src/pages/inputs/ModelTariffsMike.vue b/Vue/app/src/pages/inputs/ModelTariffsMike.vue
index 07804bc..c56b1a8 100644
--- a/Vue/app/src/pages/inputs/ModelTariffsMike.vue
+++ b/Vue/app/src/pages/inputs/ModelTariffsMike.vue
@@ -5,7 +5,7 @@
             
             <div class="container">
                 <div class="container-header">
-                    Imports
+                    Import Component
                 </div>
                 <div class="container-content">
                     <Chart class="mychart" :options="static_imports_chart_options"></Chart>
@@ -28,7 +28,7 @@
 
             <div class="container">
                 <div class="container-header">
-                    Solar Imports
+                    Solar Import Component
                 </div>
                 <div class="container-content">
                     <Chart class="mychart" :options="static_solar_imports_chart_options"></Chart>
@@ -51,7 +51,7 @@
 
             <div class="container">
                 <div class="container-header">
-                    Exports
+                    Export Component
                 </div>
                 <div class="container-content">
                     <Chart class="mychart" :options="static_exports_chart_options"></Chart>
@@ -73,7 +73,7 @@
 
             <div class="container">
                 <div class="container-header">
-                    Daily Block Tariffs
+                    Daily Block Tariff Component
                 </div>
                 <div class="container-content">
                     <div class="tariffs">
@@ -120,7 +120,7 @@
 
         <div class="container">
                 <div class="container-header">
-                    Metering Service Charges
+                    Metering Service Charge Component
                 </div>
                 <div class="container-content">
                     <div class="tariffs">
@@ -138,7 +138,7 @@
         
         <div class="container">
                 <div class="container-header">
-                    Solar
+                    Solar Component
                 </div>
                 <div class="container-content">
                     <div class="tariffs">