A couple of UI changes

See me commit comments for more info