Refactored some menu stuff, actions and what not.