Activity indicator and UI improvements