fixed timer+undecided css, refactored upcoming template