Fix layout bugs.