use notification for refresh and fix some stuff