Revert "Revert "Revert "Design update"""

This reverts commit d6845b4aea8f578f74a950388a9c938a4495cb0d.