[Layer] Fix port ordering