Better looking time line and time line bug correction