Revert "Design changes"

This reverts commit 53df34801936b5a4b11c6c257c4667e6c0615fc5.