Fix display transition issues