Revert "Initial layout"

This reverts commit b8380f045728fb434a5446436cd633e87a61bf67.