Updated GUI (not tested yet)

Updated GUI (not tested yet)