Switched test 11 to use the new StackedLayout type.
Small formatting.
Switched Simple module to use new Layout type.