Redoing notifications again, UI cleanup