added loading buttons
Merge remote-tracking branch 'origin/exp' into exp