Usability fixes for my project