(fix) Made more fixes to video player

This will fix the problem of when you click a navigation button and hit the back button