Adding menu lister and changing some annotation