Fixed Tables

Really enforced consistency in labels