Bug/table style

@alexey-rise please review!

Cheers!