cleaned up more code and fixed keyboard input bug at start screen