REF - added JSs files and refactory in base.html