Layout brush up and updates