fix some layout things