fix some layout problems