More merging of timer edit and view (osx)
More merging of timer edit and view (osx)

codeman38/toggldesktop,codeman38/toggldesktop,codeman38/toggldesktop,codeman38/toggldesktop,codeman38/toggldesktop,codeman38/toggldesktop