layouts fixes (CSS bugs)
Merge branch 'develop'