Made layout better