RFR - Jg cleanup views

Clean up layout files, fix some CSS.
Line is too long. [83/80]