Added location support for the UI