Updated StateDisplay, removed WaitScreen from widgets (now in game-window)