Update Menu.java and User.java