I worked on my new proposed layout, soon to be data-driven!