Clean up code
Restore size when clicking reset button.
Merge pull request #1673 from jburel/zoom-reset

Zoom reset