Some tweaks to table class