Updated the loading screen detection to be more accurate, relocated some portions of code

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>