Fixed issues on Narrative caused by UI changes