Fixing a couple of bugs with the views and timers.