layout viewplan fixes
fix #54
Merge branch 'develop'