merge

updated story view and index