Fix bugs and view layouts
Merge branch 'develop'