Updated layout options