Bit of clean up and css changes