Couple of layout changes