fix a type in error message, and use shorter method name for layout
Merge pull request #98 from xiaoyunwu/master

Use shorter names in layout method