Majority of css changes in place, still lots of checking to do