Updated GUI to support new stuff