Content and Style changes

Change-Id: Ie7d542875c3008344454f21de62b94b8b4b6d576