Improved Q/form tool and updated the old Q/panel tool