Revert "-layout"

This reverts commit 8e28bf9ca10aaa9d374394d6be3c2920e5756aba.
-edit help