Fix markup, overlong screen lines

Change-Id: I9dd269531cae3ab0d1547847698b59545bef4ae6
Merge "Fix markup, overlong screen lines"