Added Content

Added the content to the Info page tabs
Merge remote-tracking branch 'origin/Sprint2' into simosBranch