Upgraded to Much Stuff

Lots of little fixes, mostly layout changes and not much functionality.