Ux improvements

A few UX improvements. See commit comments for more details.

@grahamscott - Please review.