Layout fixes to gui.