Prevent zoom on generation view
Fixed merge conflict