2.1 update

Dnd layout and info warning modal updates