Some button restructuring and loading page changed
Loading merge fixed