Resovled merge conflicts from master merge

* Resoved merge conflicts
Do check it once with original UI branch. 

* Added Google search for previous target defacement (if any)
Issue #212