Added reply buttons among a few other things