Lots of graphical changes to align more with mockups.