diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a50c9d..98a59d0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name=".MyDialogFragment"
+            android:label="@string/title_activity_my_dialog_fragment"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity android:name=".VoiceActivity" />
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java
index 0fcd0b6..e814929 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java
@@ -1,150 +1,237 @@
 package org.ntlab.amaryllis.client;
 
+//import android.app.Activity;
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.view.View;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioGroup;
 
-import org.ntlab.amaryllis.client.fragment.MapsFragment;
+import org.ntlab.amaryllis.client.fragment.ListFragment;
 
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link MyDialogFragment#newInstance} factory method to
- * create an instance of this fragment.
- *
- */
-public class MyDialogFragment extends Fragment {
 
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
+public class MyDialogFragment extends DialogFragment {
 
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment DialogFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static MyDialogFragment newInstance(String param1, String param2) {
-        MyDialogFragment fragment = new MyDialogFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
+    private DialogFragmentListener dialogFragmentListener;
+    public interface DialogFragmentListener{
+        void onDialogPositiveButtonClicked();
     }
 
-    public MyDialogFragment() {
-        // Required empty public constructor
+    public MyDialogFragment newInstance(DialogFragmentListener dialogFragmentListener){
+        this.dialogFragmentListener = dialogFragmentListener;
+        return new MyDialogFragment();
     }
 
-
+    @NonNull
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState){
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity())
+                .setTitle("購入")
+                .setMessage("購入しますか？")
+                .setPositiveButton("購入する", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialogFragmentListener.onDialogPositiveButtonClicked();
+                    }
+                })
+                .setNegativeButton("やめる", null);
+
+        return dialogBuilder.create();
+    }
+
+
+    public MyDialogFragment newInstance(Fragment fragment){
+        MyDialogFragment instance = new MyDialogFragment();
+        instance.setTargetFragment(fragment, 0);
+        return instance;
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_dialog, container, false);
-    }
+    public void onAttach(Context context) {
+        super.onAttach(context);
 
-    public void show(FragmentManager manager, String dialogFragment) {
-    }
-
-
-
-
-
-
-
-    // Fragmentから生成されるダイアログ
-    public static class MyDialog extends DialogFragment {
-
-        // 選択されたラジオボタンのID
-        int mCheckedId;
-
-        public static MyDialog newInstance() {
-            return new MyDialog();
-        }
-
-        private OnOkClickListener mListener;
-        public interface OnOkClickListener {
-            public void onOkClicked(Bundle args);
-        }
-
-        //@Override
-        public void onAttach(Activity activity) {
-            super.onAttach(activity);
-            mListener = (OnOkClickListener) getTargetFragment();
-            if (mListener instanceof OnOkClickListener == false) {
-                throw new ClassCastException("実装エラー");
+        //System.out.printf("aaaaaaaaaaa");
+        Fragment targetFragment = this.getTargetFragment();
+        try{
+            if(targetFragment != null){
+                dialogFragmentListener = (DialogFragmentListener)targetFragment;
             }
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-
-            LayoutInflater inflater = getActivity().getLayoutInflater();
-            View v = inflater.inflate(R.layout.fragment_dialog, null, false);
-            RadioGroup radioGroup = (RadioGroup) v.findViewById(R.id.radioGroupOptions);
-
-            radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-                public void onCheckedChanged(RadioGroup group, int checkedId) {
-                    mCheckedId = checkedId;
-                }
-            });
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            builder.setTitle("MY DIALOG");
-            builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    // 呼び出し元フラグメントのビューを更新
-                    Bundle arg = new Bundle();
-                    arg.putInt("KEY_MYDIALOG", mCheckedId);
-                    // MyFragmentのonOkClickedをコール
-                    mListener.onOkClicked(arg);
-                }
-            });
-            builder.setNegativeButton("Cancel", null);
-            builder.setView(v);
-            return builder.create();
+        }catch (ClassCastException e){
+            throw new ClassCastException("DialogFragmentListenerをimplementしていません");
         }
     }
 
 
 
 
+/*
+
+    int mCheckedId;
+
+
+    public static MyDialogFragment newInstance() {
+
+        return new MyDialogFragment();
+    }
+
+
+    private OnOkClickListener mListener;
+    public interface OnOkClickListener {
+        void onOkClicked(Bundle args);
+    }
+
+    @Override
+    public void onAttach(Context Context) {
+        super.onAttach(Context);
+        mListener = (OnOkClickListener) getTargetFragment();
+        if (mListener instanceof OnOkClickListener == false) {
+            throw new ClassCastException("実装エラー");
+        }
+    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View v = inflater.inflate(R.layout.activity_my_dialog_fragment, null, false);
+        RadioGroup radioGroup = (RadioGroup) v.findViewById(R.id.radioGroupOptions);
+
+        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                mCheckedId = checkedId;
+            }
+        });
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle("MY DIALOG");
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                // 呼び出し元フラグメントのビューを更新
+                Bundle arg = new Bundle();
+                arg.putInt("KEY_MYDIALOG", mCheckedId);
+                // MyFragmentのonOkClickedをコール
+                mListener.onOkClicked(arg);
+            }
+        });
+        builder.setNegativeButton("Cancel", null);
+        builder.setView(v);
+        return builder.create();
+    }
+
+*/
 
 
 
 
 
-}
\ No newline at end of file
+
+    //@Override
+    //public void onCreate(Bundle savedInstanceState) {
+    //super.onCreate(savedInstanceState);
+    //if (getArguments() != null) {
+    //mParam1 = getArguments().getString(ARG_PARAM1);
+    //mParam2 = getArguments().getString(ARG_PARAM2);
+    //}
+    //}
+
+    //@Override
+    //public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    //Bundle savedInstanceState) {
+    // Inflate the layout for this fragment
+    //return inflater.inflate(R.layout.fragment_dialog, container, false);
+    //}
+
+    //public void show(FragmentManager manager, String dialogFragment) {
+    //}
+
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//public class MyDialogFragment extends AppCompatActivity {
+
+    //@Override
+    //protected void onCreate(Bundle savedInstanceState) {
+        //super.onCreate(savedInstanceState);
+        //setContentView(R.layout.activity_my_dialog_fragment);
+        //Toolbar toolbar = findViewById(R.id.toolbar);
+        //setSupportActionBar(toolbar);
+
+        //FloatingActionButton fab = findViewById(R.id.fab);
+        //fab.setOnClickListener(new View.OnClickListener() {
+            //@Override
+            //public void onClick(View view) {
+                //Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                        //.setAction("Action", null).show();
+            //}
+        //});
+    //}
+//}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
index aa9b44e..74aacfd 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
@@ -1,8 +1,14 @@
 package org.ntlab.amaryllis.client.fragment;
 
+import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
@@ -15,89 +21,174 @@
 import org.ntlab.amaryllis.client.MyDialogFragment;
 import org.ntlab.amaryllis.client.R;
 
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link ListFragment#newInstance} factory method to
- * create an instance of this fragment.
+
+
+
+
+
+/*
+
+
  */
-public class ListFragment extends Fragment implements MyDialogFragment.MyDialog.OnOkClickListener {
 
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
 
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
 
-    public ListFragment() {
-        // Required empty public constructor
+// 呼び出し元のFragment
+//public class ListFragment extends Fragment implements OnOkClickListener {
+public class ListFragment extends Fragment {
+
+    // ダイアログを表示するボタン
+    Button mDispDialog;
+    // ダイアログで選択したものを反映するTextView
+    TextView mSelectedText;
+
+    //@Override
+    //public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        //super.onViewCreated(view, savedInstanceState);
+
+        //mDispDialog = (Button) view.findViewById(R.id.btnDispDialog);
+        //mDispDialog.setOnClickListener(new View.OnClickListener() {
+            //public void onClick(View v) {
+                //showMyDialog();
+                //FragmentManager manager = getActivity().getSupportFragmentManager();
+                //MyDialogFragment dialog = MyDialogFragment.newInstance();
+                //dialog.setTargetFragment(ListFragment.this, 0); // ★★★
+                //dialog.show(getFragmentManager(), "Dialog");
+            //}
+        //});
+    //}
+
+
+    //void showMyDialog() {
+        //FragmentManager manager = getActivity().getSupportFragmentManager();
+        //MyDialogFragment dialog = MyDialogFragment.newInstance(this, REQUEST_NAME);
+        //dialog.setTargetFragment(ListFragment.this, 0); // ★★★
+        //dialog.show(getFragmentManager(), "Dialog");
+    //}
+
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        View v = inflater.inflate(R.layout.fragment_list, container, false);
+
+        mSelectedText = (TextView) v.findViewById(R.id.textSelected);
+        mDispDialog = (Button) v.findViewById(R.id.btnDispDialog);
+        mDispDialog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //FragmentManager manager = getActivity().getSupportFragmentManager();
+                DialogFragment dialog = new MyDialogFragment();
+                //DialogFragment dialog = MyDialogFragment.newInstance();
+                dialog.setTargetFragment(ListFragment.this, 0); // ★★★
+                dialog.show(getFragmentManager(),null);
+            }
+        });
+        //return inflater.inflate(R.layout.fragment_list, container, false);
+        return v;
     }
 
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment BlankFragment.
-     */
+
+
+
+
+/*
+
+    public static class aaaaFragment extends DialogFragment {
+
+        private org.ntlab.amaryllis.client.MyDialogFragment.DialogFragmentListener dialogFragmentListener;
+
+        public interface DialogFragmentListener {
+            void onDialogPositiveButtonClicked();
+        }
+
+        public org.ntlab.amaryllis.client.MyDialogFragment newInstance(org.ntlab.amaryllis.client.MyDialogFragment.DialogFragmentListener dialogFragmentListener) {
+            this.dialogFragmentListener = dialogFragmentListener;
+            return new org.ntlab.amaryllis.client.MyDialogFragment();
+        }
+
+        @NonNull
+        @Override
+        public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity())
+                    .setTitle("購入")
+                    .setMessage("購入しますか？")
+                    .setPositiveButton("購入する", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialogFragmentListener.onDialogPositiveButtonClicked();
+                        }
+                    })
+                    .setNegativeButton("やめる", null);
+
+            return dialogBuilder.create();
+        }
+
+
+        @Override
+        public void onAttach(Context context) {
+            super.onAttach(context);
+
+            Fragment targetFragment = this.getTargetFragment();
+            try{
+                if(targetFragment != null){
+                    dialogFragmentListener = (MyDialogFragment.DialogFragmentListener)targetFragment;
+                }
+            }catch (ClassCastException e){
+                throw new ClassCastException("DialogFragmentListenerをimplementしていません");
+            }
+        }
+
+        public MyDialogFragment newInstance(Fragment fragment){
+            MyDialogFragment instance = new MyDialogFragment();
+            instance.setTargetFragment(fragment, 0);
+            return instance;
+        }
+
+
+
+    }
+
+
+*/
+
+
+
+
+
+
+
+
     // TODO: Rename and change types and number of parameters
-    public static ListFragment newInstance(String param1, String param2) {
-        ListFragment fragment = new ListFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
+    //public static ListFragment newInstance(String param1, String param2) {
+        //ListFragment fragment = new ListFragment();
+        //Bundle args = new Bundle();
+        //fragment.setArguments(args);
+        //return fragment;
+    //}
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
+
         }
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    //@Override
+    //public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             //Bundle savedInstanceState) {
 
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_list, container, false);
-    }
-}
+        //return inflater.inflate(R.layout.fragment_list, container, false);
+    //}
 
-// 呼び出し元のFragment
-class MyFragment extends Fragment implements MyDialogFragment.MyDialog.OnOkClickListener {
 
-    // ダイアログを表示するボタン
-    private Button mDispDialog;
-    // ダイアログで選択したものを反映するTextView
-    private TextView mSelectedText;
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_dialog, container, false);
-
-        mSelectedText = (TextView) v.findViewById(R.id.textSelected);
-        mDispDialog = (Button) v.findViewById(R.id.btnDispDialog);
-        mDispDialog.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                FragmentManager manager = getActivity().getSupportFragmentManager();
-                MyDialogFragment.MyDialog dialog = MyDialogFragment.MyDialog.newInstance();
-                dialog.setTargetFragment(MyFragment.this, 0); // ★★★
-                dialog.show(manager, "MyDialog");
-            }
-        });
-        return v;
-    }
-
+/*
     // コールバックされるメソッド
-    @Override
+    //@Override
     public void onOkClicked(Bundle args) {
         int selectedId = args.getInt("KEY_MYDIALOG");
         String text = "none";
@@ -117,4 +208,5 @@
 
         mSelectedText.setText(text.toString());
     }
+ */
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
index 00cfc02..0770f30 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
@@ -2,31 +2,22 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.media.MediaPlayer;
 import android.media.MediaRecorder;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Base64;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.util.Log;
 
 
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -36,12 +27,8 @@
 import com.google.android.gms.maps.model.MarkerOptions;
 
 import org.ntlab.amaryllis.client.Amaryllis;
-import org.ntlab.amaryllis.client.MyDialogFragment;
 import org.ntlab.amaryllis.client.R;
-import org.ntlab.amaryllis.client.VoiceActivity;
-import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.entities.Voicememo;
-import org.ntlab.amaryllis.client.resources.AccountsRest;
 import org.ntlab.amaryllis.client.resources.VoicememosRest;
 
 import java.io.File;
@@ -104,13 +91,13 @@
                              @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
 
-        View v = inflater.inflate(R.layout.fragment_dialog, container, false);
-        mSelectedText = (TextView) v.findViewById(R.id.textSelected);
+        //View v = inflater.inflate(R.layout.fragment_dialog, container, false);
+        //mSelectedText = (TextView) v.findViewById(R.id.textSelected);
 
 
-        dialogButton = (Button)v.findViewById(R.id.dialog);
-        dialogButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
+        //dialogButton = (Button)v.findViewById(R.id.dialog);
+        //dialogButton.setOnClickListener(new View.OnClickListener() {
+            //public void onClick(View v) {
                 //Record();
                 //FragmentManager manager = getActivity().getSupportFragmentManager();
                 //MyDialogFragment dialog = MyDialogFragment.newInstance();
@@ -118,8 +105,8 @@
                 //dialog.show(manager, "MyDialogFragment");
 
 
-            }
-        });
+            //}
+        //});
 
 
         return inflater.inflate(R.layout.fragment_maps, container, false);
@@ -405,10 +392,10 @@
             void onDialogPositiveButtonClicked();
         }
 
-        public MyDialogFragment newInstance(DialogFragmentListener dialogFragmentListener) {
-            this.dialogFragmentListener = dialogFragmentListener;
-            return new MyDialogFragment();
-        }
+        //public MyDialogFragment newInstance(DialogFragmentListener dialogFragmentListener) {
+            //this.dialogFragmentListener = dialogFragmentListener;
+            //return new MyDialogFragment();
+        //}
 
         //
         //@Override
diff --git a/app/src/main/res/layout/activity_my_dialog_fragment.xml b/app/src/main/res/layout/activity_my_dialog_fragment.xml
new file mode 100644
index 0000000..9db7dc0
--- /dev/null
+++ b/app/src/main/res/layout/activity_my_dialog_fragment.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MyDialogFragment">
+
+
+    <RadioGroup
+        android:id="@+id/radioGroupOptions"
+        android:layout_width="match_parent"
+        android:layout_height="473dp" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dialog.xml b/app/src/main/res/layout/fragment_dialog.xml
deleted file mode 100644
index 6e868d8..0000000
--- a/app/src/main/res/layout/fragment_dialog.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MyDialogFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-
-
-    <RadioGroup
-        android:id="@+id/radioGroupOptions"
-        android:layout_width="121dp"
-        android:layout_height="121dp"
-        tools:layout_editor_absoluteX="142dp"
-        tools:layout_editor_absoluteY="181dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..8669ece
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph"
+    app:startDestination="@id/FirstFragment">
+
+    <fragment
+        android:id="@+id/FirstFragment"
+        android:name="org.ntlab.amaryllis.client.FirstFragment"
+        android:label="@string/first_fragment_label"
+        tools:layout="@layout/fragment_first">
+
+        <action
+            android:id="@+id/action_FirstFragment_to_SecondFragment"
+            app:destination="@id/SecondFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/SecondFragment"
+        android:name="org.ntlab.amaryllis.client.SecondFragment"
+        android:label="@string/second_fragment_label"
+        tools:layout="@layout/fragment_second">
+
+        <action
+            android:id="@+id/action_SecondFragment_to_FirstFragment"
+            app:destination="@id/FirstFragment" />
+    </fragment>
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..125df87
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6eacaad..b5af447 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,13 @@
     <string name="title_activity_account">Account</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="title_activity_my_dialog_fragment">MyDialogFragment</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+
+    <string name="hello_first_fragment">Hello first fragment</string>
+    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fac9291..21d9ced 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,4 +7,13 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
\ No newline at end of file