UI & usability fixes