Done some improvements on the GUI.