Fixed constant committed by mistake
Introduced new VesselOverview object
Resolved conflicts