Adding edit/remove buttons again...