added loading page & other fixes