refactored sass and added new components