Layout changes and Bug fixes for tables