more layout bugs fixed3