fixed time label null pointer
Merge branch 'edit' of https://github.com/simonjrp/ESCAPE into edit