Refactor entry rendering in story