Fixed incorrect time label start value
Code cleanup
Merge branch 'bugfix/pause_issue' into develop