Fix some layout things