Code improvements and fixes for track and scene navigation.
First attempt to implement device layer navigation (API broken).