Updated Gui and Fixed Bugs