merg
Revert "merg"

This reverts commit 52fa051538d35b93a4b790dd0aeab54105a771ee.
cleaned help and layout