Fix several problems with the Location view and model