Remove an old superseded js
Add map-tools div to base template
Refatcor templates to remove code dupplications
Small fix