Added closemodal back in