Fixing the issues to speed up the mobile loading