updated track view, better highlights