Further refactoring of js and scss. Now builds