WIP: Company page revision based on new page structure