Refactored SASS and split into separate components