Make changes as per request.
Also added a 'loading records' indicator.