Added volume indicator / controll

Also, minor refactoring