Fixed -Main Menu & issue No-25