fixing progress spinner to mvp and shit
fixing merge conflicts
check internet availability
fixed merge conflicts
small fixx's
nothing really...
merge conflict fix
fix