Made some final changes to app. Removed database functionality