Added dynamic location and building tracker (selects the current building if chosen, the first if at least one exists and a default if none available)