Use XHTML breaks

Change-Id: Ia00b4e754dd3d7e73723c481b96077b552deeced