Improve UX. Should amend but has pushed. Conflints with previous commit.