Added ZoomEnhancer, some Refactoring.