Small UI rearrangement, tab order changes, and new screenshot