clean up and fix player buttons