bring back other view changes upstream

These other changes were made in purchase-workflow#66.