Added more option controls to option dialog.
Fixing issue in build system.