• Fix widget creation
• Support command options
