Started fixing GUI.