Tagging Location and UI Improvements