wee bit better layout