Refactoring show-timeline based on Sadegh's suggestions