Fix bugs and display errors
Fix bugs and make easier for the app