Refactor search form in templates
Cleanup templates for map panels
Rearrange map templates