Revert "Redesign!"

This reverts commit 04fc21f6cadccdddb4bd5cc76db110c8e2c25ed9.
Re-redesign