Sass refactoring and UI work
Js refactor and bug fixes