Added more functions in player and replaced some more in mainview