Added company and badge sections
Fixed merge conflict on css