More layout changes eh
trying to clean up some conflicts...