Cleanup and added test page for main app