white screen at the start fixed + offline json updated.
Merge with dev