Changes and testing to location rendering.