added loading and zoom