UI changes
More UI rearrangement.