Loading indicator and more style improvements