Updated main app
Properly reset program