Changed to use predefined layouts.