fixed some z index issue