updated controller and view to include routing of graph option
Merge remote-tracking branch 'origin'

Merging in  controller updates.