Fixes to templating and css