working on correcting problem with rendering the graphs
Merge remote-tracking branch 'origin'

Merging the add_sub.html.erb and some updates to the graph controller in the attempt to correct the graphs pages and options.