Update layout to handle the double items as a mandatory directive not as an optional one