Got both containers working with d&d
Removed switch for drag & drop