Refactored CSS

Organized CSS and removed unnecessary code including duplicates.
Merge branch 'design'