fixed some layout problems