fixed a model bug
reverted some recent changes and added more menus
removed some unwanted files
remove lots of junk files
removed conflict