Modal: revert div heirarchy change in 5020547