Revert "Improvements to code, functionality, demo page"

This reverts commit 260636e5e21888e3e7cdbede02fb522178f7603c.