Improved UX and started on showing a loader gif.