Fixed layout a bit