Few quick fixes
Revisited the app to make it work again.