Revert "Improved location rendering"

This reverts commit 672d47d3f1b149cae3e9a4fe2fc37ba24030e129.
Improved location drawing