style fixes and css/template cleanup