Couple layout fixes