Bug fix #505
Improve display of time line control
Minor fix
Performance improvement