fixing text-states and alerts
relocating preloader
merge
Merge branch 'franllull-fixing-state-colors' into develop