fix layout bugs
Merge pull request #2125 from bechi/bugs/waiting-copayers

fix layout bugs