use labels for input elements
Merge branch 'geo'