Refactor CSS and JS accordingly
Merge branch 'develop'