Try to change loading image
Minor fixes (rename, formating)