Some UI improvements.
Refactoring of timer code. Add states.