Added graph and sorting to layout