Can we put this into a layout update that we can reuse to keep it more DRY?