fix bug for users with no data, improve UX while loading