Revert "DAR-2106 | Remove un-needed code"

This reverts commit 14f1cc38cc85553b84333c00541b07ffb39fc6c5.
Revert "DAR-398 | Fix for responsive Theme Designer"

This reverts commit 4741be2295180ad1f52c203868cd3f96bbd1264b.