GUI Fixes/State Updates

States can now change to other states.