Some more gui reorginization stuff.