Fix layout a bit