Added Landmark alarm view
Fixed merge conflicts