Updated MainActivity and Graph