To match the new design requirements.

Amend commit message to better explain what’s changing and why.

Small changes and rebase.