Map + loading updated
Merge branch 'Loading'