Main Menu added
merge fix