Fixed refreshing code in various classes