Minor fixes in ItsNat Web introduced doing Droid
Added many Overrides
Changed folder templates