Edit context menu. House cookie add.
Merge branch '0019-switch-on-map' into develop