Use dropdown for pen width
Merge branch 'develop'