Revert "Stuff"

This reverts commit baeb1cfe87c9f6d6b515ec125988c396cccfe945.
Revert "New layout"

This reverts commit bc963b51a05dd56d16ab510afe82630d5dcd4768.