Rework status table to be less dynamically generated.