#212 - Support screen UX changes from @Twitkin