Some layout fixes to main mostly.