Finished the styling on the companies
Fixed merge conflicts