Fix load screen and calculation