Fix layout issue
Merge branch 'develop'