did some changes from home
added preloader service
Merging conflict resolved