Fixed bugs and improved the app
