Lots of messy updates, just hacking on CSS