Fix Spacing for Headers

Change-Id: Ib8c625f471e8dab20d50f99939611132185854d9