Refactor css for modularity.
Remove unused classes
Merge remote-tracking branch 'origin/develop' into develop