Revert "layouts and bug fixes"

This reverts commit 40c9e440e19be619d49f21522e5dac7ebe120288.
permissions changes