added modal and corrected services