Added a mute button and a little cleanup