Fix for zooming, changes after CR and cleaning up sources