More merging of timer edit and view (osx)