Finish up the options view controler
Completed query builder