Added width and height property to canvas control
Refactored export method