Fixed layout a little bit