Final tweaks to fix sound and incorrect displaying of buttons