Couple of usability updates