Revert "added edit timer option, made more UI changes"

This reverts commit bbed822b51ff610d5747b61a6401dddfebd65aa1.
found a bug
Revert "Revert "added edit timer option, made more UI changes""

This reverts commit 91fb50da14c832c05247b529b95ba66a5275bdac.