Format adjustments and consistant titles.

Change-Id: I819a3f56c803cb88fa68c1522b9c584b1f4096e3
Signed-off-by: Thomas Kee <xsited@yahoo.com>
Merge "Format adjustments and consistant titles."