partials and css refactored