Usability updates, cleanup