Small UI and usability fixes