Donkey: You might have a Panel on the generated prefab - people tend to accidentally add it by editing the prefabs in the root of the hierarchy. Kill that off and it should sort properly.
Otherwise, make a backup and try to upgrade to 3.0 - if it fails, roll back and check the prefab properly.
anord: You should change the depth values run time so it's sorted the way you want.