Reworked the HTML structure to be better-suited for multiple view types.