Reconfig layout some