layout bugs fixed