Add none radio button to visual tools
Fix merging conflicts