Tweaks for display handling and traversal