Fixed strange urls
Seperated the company item into an partial
Changed code to conform to code standards.