Some more gui clean-up.