More layout fixes over lunchie timez