Menu framework + wisp movement change.
Forgot committing this.