BUG: Fix text in margin issues

Change-Id: I2e51e6f723671758426e0d744989489528beaa5e
Merge topic 'book1-amazon-fixes'

e5fef514 BUG: Fix text in margin issues