added css, and partials for all views
fixed merge conflicts on css
fixed merge conflicts again