Fixed layout better