Fixed layout issue