loading indicator and flow fixes