added a better layout