Couple of small layout fixes