Fixing next button
Refactoring player controls