Added table class, properties and tweaks