Add puck to container view, validate editing samples
Remove old columns