Use a bit more compact layout