layout issues fixed