Selecting the Organization name should display the Agenda view

I need one click access to the agenda (while still maintaining calendar as the default scheduling view.) This used to be available by clicking the organization name but has since disappeared since the schedule optimization preview rolled out. Now you have 2 links leading to the same place: clicking the organization name and clicking the schedule preview both lead to the calendar. The agenda is the simplest place to create a progress note from and it should not take multiple clicks to be able to access.