Fix match layout