Adjust structure of syntax layout