Moved variables from currentSatate to Gui