Some more fixes, also moved terms to the sidebar on nodes editor