Refactoring, added Companies pages