Revert "Starting Redesign"

This reverts commit cfc04d02a8cb4fecc6f515a84eb8eed8ed7b0ef6.