Refactor Main Timeline