Started rework the GUI.