improved UI for toolbar and tracking pages