Revert "Update with my version of app and index which is cleaner"

This reverts commit 284a0c7c1568d3626f403d9188b2175ee8712793, reversing
changes made to d1aab712f839f632dcd951c4ce17a7fdb4b32ad0.