Fixed issue with loading order of assets and fixed nav