Fix NPE.
Update table formatting.