Removed Map on Home screen as it is unnecessary
Merge branch 'remove-map' into development