Lots of changes, css updates amound other things