Refactored out CSS and some partials