+ refactoring of Targets page in order to support all its functionalities.