refactored some sass, continued styling layout