Step 3) fix integrated codebase

The command and query widgets are now integrated in
separate CollapsibleButton frames, with appropriate
changes.