Base: Cleanup loading show/hide calls and improve feedback