Prevent long words breaking container and making a horizontal scroll bar appear

Change-Id: I9c68ce31e55b865cb9a5cb5a56c960244086a7d6