In Progress: fix zomming in