Merge pull request #166 from madd15/develop

No Result on user page not showing correctly
Fixes PR #168 and #167
Merge pull request #170 from madd15/develop

Fix #117
Resolves #155
Fixed missing string
Better phrasing
Helpful links for hardware view