Combined styles and cleaned up some SASS