fix ui not reflecting add/remove of clock
fix typo
delete files when deleting clock
Merge remote-tracking branch 'origin/master'