Fixed missing close tag causing a serious formatting error, and couple of smaller formatting fixes. #14877

Change-Id: I6d96f631056d52ef9853ee9ab614a00e8c4218aa