Moved the two button listeners to their own classes
Added whispers tag handler