Usability fixes & updates