Issue #20:Removed popup containers