refactoring and scss updates