updates to graph and color screen.
fixed merge conflict