Based usability fixes