Significant, working changes to Scanner UI