improve some desktop css
tidy up some phone / tablet css
move media query logic into the CSS