Added loading and refresh