Upload module: refactored templates