did a bunch of UI polish (more to do, though)