Add title defaulting support

Change-Id: I505615750b3d7ef48419d65c72eedb29985504cb
Updated spacing

Change-Id: Ib8599f5a7459a3cad122ec47b6b613574ff22e56