Added context menu; added findById in context menu