Fix some vessel issues
New vessel layout. Fluid