Some usability cleanup