Add loading
Improve responsiveness