Rearrange story view code, and a menu entry for news