Updated templates
Added download function