Change markup to reflect new design

[#64598574] still need to confirm after deploy. This should do it
though.