Changed to new table formatting system
Trying to get better formatting