Fix back bug from DisplayFlashDeck
Refactor Time and score

Move time and score from flash card to content card.
This requires refactoring of the decks too
Fix score bug

Wrong ID is used for updating score,
causing the score to not be svaved