Updated GUI to be simpler