#16 Improved fade transition behavior