Fixed UI for locations