Some fixes to the layout and changes to gui.