SITE-386: First draft of redesign