fixing all score and end screen switching related issues