Revert "Merge pull request #43 from kshimatsu/another_layout"

This reverts commit d056fbaa9fcf8d310b55822b38967548c15f7f13, reversing
changes made to bf4fb26f475c30509f114feacb71e8ca784ab36e.