Small changes to tag classes/ Add Joke class

Maybe Joke class won’t need to be used.