Some small usability fixes.