added custom finder, notficationmodal, clean up