Some UI re-arrangements.