More misc work on the new GUI system.

The build is broken with this commit.