Refactoring fleets view - add scan upload, move model property