fixing styles and templates