UI updates, usability fixes