Polished menus and combat
Removed unnecessary code