fixed some layout