Fix zoom mappings
Cosmetic changes