A bit better layout