Track chooser features

Some stability updates and new track chooser features