removed click trigger, fixed view toggling in player
Merge remote-tracking branch 'origin/master' into player