Added better layout