Fixed issues with label doodle not saving and tidied up optic disk doodle