Fixes for storiesand back-button