rearranging some SASS