Adds computation table on investments page.
Fixed merge conflicts on branch slave