Add loading button
fix merge conflicts