Work on GUI
GUI Updates