Updated GUI

Updated GUI
Fixed Bugs