Tweaking for display issues