Added loading screen
Change some pins
Merging loading