Added Container and Vessel layouts. CurrentList in vessel has issues.