Fixed bug regarding .shp.xml uploads. Minor template/form cleanup.