Added stroke size picker
Cleaned up code