APM Toolbar: Improve Tab highlighting and selection