fixed flashing of cards
token should no longer appear after returning from end canvas
fixed issue where timeline button not always active