fixing layout bugs