Refactoring fleets view