Fix upload button
Fix templates