Added a refresh now button, fixed blocking on failed connection