Notably there is some code cleanup with the zooming functionality, I've created a new module to reduce code duplication.