Table Layout issues fixed