Refactored css to different sections
More refactoring and some design tweaks
Merge branch 'develop'