Revert "Redesign"

This reverts commit cbc36f94853f19f8a78016f77f5f4e423f610c20.
Revert "Revert "Redesign""

This reverts commit b0af2d56483a6f08cb2ab5ba99da4368fbb85b7a.