Added a better layout