Markup refactoring, CSS module for speaker