Loading indicator and JS additions