added better layout