Minor tweaks to fix the issues with the text disapearing one the second screen