More layout work on the new GUI system.