Updated jsx.
Some 80 char width improvments.
Fixed merge conflict.