bug fixes
Merge branch 'CauseLayout' into develop