More fixes to styles and templates