-Some more gui code cleanup