* Added improvement for timeline view