Added Popup menu and removed obsolete actionBar menu codes