Moved control fields into seperate methods
Added doodle controls to doodle popup