Tweaked templates and css