CSS changes, pretty much ready for internal demo