Add refresh and network error handling