fix for bug 8 and 9

animations would stop working after period of time
white flash between template transistions