more layout bugs fixed