files upload & better templates