Fixed the no mute etc and tweak to popup