Graphs page and some fixs + fix issue #1