added an angular player bar, need to fix merge