Refactor Graphs and add the figure in return

From Jorge :

return fig to matplot.MaplotLibGraphs.main_layout()