Changes to settings
Merge remote-tracking branch 'origin/master'
Finished drawing part with settings