Marq 2 Calendar Issue and Battery Life

Marq 2 Athlete Calendar has started to display ‘Suggested Workouts’ and not my personal calendar entries (since upgrading to 17.23 I believe). Unable to find any way to switch it back. Any help appreciated or is it a software bug?

Also, battery life seems to have dropped, ant thoughts?