Update code

Handle AspectFit mode as well as zoom issue