Companies page major refactoring