Fixing up static files, fix wrong merging in base.html