GUI Fixups

A couple of things that have been driving me crazy for a long time.