iterating on the layout a bit, still not super happy