Revert "Working on responsiveness"

This reverts commit 8f489bfa67a0a8b4c63f17858daf6d0c2445b26c.

Reverts non-satisfactory commit to move out of master branch