add more to the UI and locations functionality