location service and UI fixes