Various GUI changes.  See commits for more details.