Updated layout to include graph manager