Fix bugs and make easier for the app