Further Cleanup

Increased app responsiveness buy removing duplicate code and condensing
the app into a single page down from four pages.