Popup: Added Fade behavior
Lots of Fixes
Removed debug code