fix layout problem, 2nd try