Update to dev branch + zoom level fix