Refactored line, rectangle and ellipse modes
Merge pull request #68 from wieslawsoltes/controller

Refactored line, rectangle and ellipse modes