Graph page Fix #7