reorganize timing of zoom to button calls
minor cleanup