Fixed Buttons and added sound utils