Updated layout to use defaults