Spiked some ui
Changed ui
TimerActionListener tests
Cleaned up some code