Mostly changes code so a bunch of UI stuff can be drawn again. Changes input handling while waiting for input etc as well.