(much) Tighter layout