GUI layout fixes