fixed layout bugs.