Interface and usability fixes