Lots of new stuff, cleaned up UI