improve entry display and loading state