Special layout files now work (Fixed #308)