diff --git a/flask/app/datalogger/models.py b/flask/app/datalogger/models.py
index e2dfa6e..081ae0c 100644
--- a/flask/app/datalogger/models.py
+++ b/flask/app/datalogger/models.py
@@ -205,7 +205,7 @@ class Card(db.Model):
 
 
 class GaugeOffVal(db.Model):
-    __tablename__ = "gauge_off_vals"
+    __tablename__ = "gauge_off"
     _id = db.Column(db.Integer, primary_key=True)
     spm_average = db.Column(db.Float)
     downhole_gross_stroke_average = db.Column(db.Float)
@@ -257,7 +257,7 @@ class GaugeOffVal(db.Model):
         }
 
 class WellTest(db.Model):
-    __tablename__ = "well_test_vals"
+    __tablename__ = "well_tests"
     _id = db.Column(db.Integer, primary_key=True)
     duration_hours = db.Column(db.Float)
     volume_h2o_actual = db.Column(db.Float)
diff --git a/flask/app/static/js/welltest.controller.js b/flask/app/static/js/welltest.controller.js
index 011583a..f34c62e 100644
--- a/flask/app/static/js/welltest.controller.js
+++ b/flask/app/static/js/welltest.controller.js
@@ -10,7 +10,7 @@ poconsole.controller('wellTestCtrl', function($scope, Page, WellTest) {
                 d.objects[j].created_on = Date.create(d.objects[j].created_on + "Z", { fromUTC: true });
                 // console.log({'Date After':d.objects[j].created_on});
             }
-            $scope.notes = d.objects;
+            $scope.well_test_vals = d.objects;
             $scope.num_pages = d.total_pages;
             $scope.page_list = [];
             $scope.page_num = d.page;
diff --git a/flask/app/static/templates/events.html b/flask/app/static/templates/events.html
index 4aab829..2c64499 100644
--- a/flask/app/static/templates/events.html
+++ b/flask/app/static/templates/events.html
@@ -41,6 +41,7 @@
 					</tr>
 				</tbody>
 			</table>
+			<div ng-if="event_data.length==0" class="well" style="text-align:center">No stored events yet.</div>
 		</div>
 	</div>
 </div>
diff --git a/flask/app/static/templates/gaugeOff.html b/flask/app/static/templates/gaugeOff.html
index 10ab620..aabda86 100644
--- a/flask/app/static/templates/gaugeOff.html
+++ b/flask/app/static/templates/gaugeOff.html
@@ -61,6 +61,7 @@
 	    				</tr>
 	                </tbody>
 	            </table>
+				<div ng-if="gauge_off_vals.length==0" class="well" style="text-align:center">No stored data yet.</div>
 			</div>
         </div>
     </div>
diff --git a/flask/app/static/templates/tags.html b/flask/app/static/templates/tags.html
index 9661113..2e40911 100644
--- a/flask/app/static/templates/tags.html
+++ b/flask/app/static/templates/tags.html
@@ -254,6 +254,7 @@
 						</tr>
 					</tbody>
 				</table>
+                <div ng-if="tags.length==0" class="well" style="text-align:center">No tags yet.</div>
                 <a ng-if="tags_to_plot" class="btn btn-success" href="/#/tag/{{tags_to_plot}}">
                     Compare Tags
                 </a>