Revert "New design"

This reverts commit 19709217b2a89abcc0537f0f31bfba2d5f30d060.