Tweaks to how display works