improve timeline page
merge