Updated layout formatting