merged timeline player to main stage and fixed some type errors