Merge redesign part 1.

M committed Sep 1, 2020 at 14:18 UTC c950f8bfc018e981ba70e245ded926419dcb5aed

No changes.