Merge "Dnd settings pages redesign (round 1)"