fix layout bugs
Merge branch 'master' into develop