Minor fixes and changes

TimerApp is still only a mockup