Improved location rendering