Fixed Leflet zoom and refactor view