Final Mock-ups
I have now made all necessary changes to my high resolution mock-ups, and created more screens.
I also re-sized some of my buttons so that they remain a consistent height throughout, and added them to my design system.
Here are my final screens: