Some layout fixes