Updated to use DialogFragment