Various front end style tweaks/some code cleanup