Adding the loading page and other little changes