Fix awkward <br> tags in rendered HTML /cc @danbernier