Loader working again and notification not alwas showing anymore