Add MainMenu; Reorder Main ;Bug fixing