Removed Obsolete menu file and added popup menu file