more layout bugs fixed2