Put menu in separate file and user list order fix