Moved targetid and changed some layout