UX improvements https://twitter.com/gauthamzzz/status/1266712086102581248