Some cleanup; added zoom control