Move location rendering out of data model