Template and css fixes