RFR - Jg cleanup views

Clean up layout files, fix some CSS.