Tab views and other logic reworking on the front end