FIX z-index issue when swapping Blocks
Merge Conflict