with loading indicator
UI tweaks