Add volume buttons and tidy sharing code