refactored timeline view