Added 1-9 volume keys. More refactoring.