Working app
Fixing issues