consolidated SASS files and refactored JavaScript code