[fixed some layout bugs