Added better navigation and muting