Improved ui
Improved volume