Improved the loading of the app and fixed loading of files