trackers->references, bring back the calendar icons, misc cleanup