Redesign layout applied to main