More general work on the new GUI system.