Changing layout to use defined().