Added new updates for z-index issue