Location and UI improvements