css and template cleanup