Revert "Menu + Layout changes"

This reverts commit 4c3deb19eb1aefec9166b1ac021bcf1440b44a9e.