Fused upload into base.html and updated references to js and css. Also removed some comments.