Updated the custom screen handling and cleared out the console.log calls