Make layout a bit more compact