Add some UX elements and fix a typo