Update homepage for new mappings API
Fix issue with user being called while potentially nil