Highlight shapes on the map when activated

- Add active and inactive styles
- Create a new feature group for shapes, apart from markers so that inactive styles can just be applied to that entire group
Remove dummy watch areas from template