Simplify config layout