Added zoom handling