ADD::loading cursor and bug fix