Builder: Removed self closing tags & replaced <br> by <p>