Made some improvements on the GUI