fixed notifications and page refresh