Update and correct table formatting