Revert "New Layout"

This reverts commit db892a2af321a8ab2bc110c67a58750ecf3abc88.