added current location in UI
Merge remote-tracking branch 'origin/feature/LABB-44' into feature/LABB-44