Add volume restriction
Cleanup display messages