Revert "Design update"

This reverts commit ccc3e237a19874d7920198a79d78b224cc322fb2.
Revert "Revert "Design update""

This reverts commit 611f13aabc9c6a8530fb9cfc13885add334030e3.