Fixed wrapped layout for new syntax