Added add-target button.
big merge