Menu changed and models refactored