add new tool request dialog.fix conflicts
fix compilation issues
Small change to keep pace with widget work