reorg and tidying up the css - ideally i'd like to have all this done using SASS instead