Minor changes to ensure that we have no errors around user location being null. Also view changes to have map displayed correctly on screen.