Some layout fixes to better merge