Setting width of stackpanels
Merge branch 'cleanup' into develop
Merge branch 'develop'