Update: Refactor Menu State
Update: Refactor app.states