Some HTML Cleanup, BAU-102
Cleaning up some messaging, BAU-102