add loading bar
reformat