Revert "mess with layout a bit"

This reverts commit d843b46a4ab1e28ea25f40c4f3464574bdbac904.
remove a few things