fix storyline view
Merge branch 'master' into suhas/loginwork

* master:
  fix storyline view