Switched Query builder to a navigation controller to let us do flow based selection of options.

Also built the options view controller to let us display options