lots of refactoring to stylesheets and partials