more layout issues fixed