added parallax and graphs
fixed merge conflicts