Add zoom fonctionality

+ some correction