#5009: Edit and remove buttons was fixed