A few changes to the Work Tables

Still don’t know what’s causing the [?] button weirdness