Revert "Initial with new design"

This reverts commit 671b4e2fdeec7d731423977788440b785a7bed8f.