Fixes for better table look.

Fixes for better table look.