Updated app and cleaned up project for fresh start