Large batch of changes after initial designer feedback.