Merge redesign part 5.

M committed Sep 10, 2020 at 17:51 UTC 6e6a0816857ed4cea028f4b8acefd9c7c89c20a4

No changes.