CSS clean up
Template design fixes