Tweak UX to match colour scheme and fix merge conflict