refactored story views