Improved Q/panel and Q/form tool