Helpers, partials and refactoring with a new style sheet for better content layout in place