Minor change: add different layouts.