diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
index 299cfff..c343164 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
@@ -4,6 +4,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
@@ -51,7 +53,7 @@
     private static final String TAG = MainActivity.class.getSimpleName();
     LocationManager locationManager;
     private ArrayList<LocationListener> listeners = new ArrayList<>();
-    private HashMap<String ,Category> categories;
+    static   HashMap<String ,Category> categories;
     ArrayList<String> checkedList = new ArrayList<>();
     HashMap<Integer,String> menuItemMap = new HashMap<>();
 
@@ -200,40 +202,58 @@
     public Category getCategory(String cid){
         return categories.get(cid);
     }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
-
-        //カテゴリーの数だけitemを定義
-        for(Category category : categories.values()){
-            String name = category.getName();
-            String cid = category.getcId();
-            MenuItem newItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, name);
-            menuItemMap.put(newItem.getItemId(),cid);
-            newItem.setCheckable(true);
-            newItem.setChecked(true);
-            checkedList.add(cid);
-        }
-        return true;
+    public static HashMap<String,Category> getCategories(){
+        return categories;
     }
 
+    //以下MapsFragmentに移植
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
+//
+//        //カテゴリーの数だけitemを定義
+//
+//        for(Category category : categories.values()){
+//            String name = category.getName();
+//            String cid = category.getcId();
+//            MenuItem newItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, name);
+//            menuItemMap.put(newItem.getItemId(),cid);
+//            newItem.setCheckable(true);
+//            newItem.setChecked(true);
+//            checkedList.add(cid);
+//        }
+//        return true;
+//    }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        String cid = menuItemMap.get(item.getItemId());
-
-        item.setChecked(!item.isChecked());
-        if(item.isChecked()){
-            checkedList.remove(cid);
-        }else{
-            checkedList.add(cid);
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public ArrayList getCheckedCidList() {
-        return checkedList;
-    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        String cid = menuItemMap.get(item.getItemId());
+//
+//        item.setChecked(!item.isChecked());
+//        if(item.isChecked()){
+//            checkedList.remove(cid);
+//        }else{
+//            checkedList.add(cid);
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+//
+//    public ArrayList getCheckedCidList() {
+//        return checkedList;
+//    }
+//
+//    @Override
+//
+//    public boolean onPrepareOptionsMenu(Menu menu) {
+//        Fragment f =getSupportFragmentManager().findFragmentById(R.id.map);
+//
+//        if (true) {
+//            return true;
+//        } else {
+//            return false;
+//        }
+//
+//    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
index ba4cf1c..00ab866 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -45,7 +45,7 @@
         Amaryllis amaryllis =(Amaryllis) getApplication();
         String uid = amaryllis.getUid();
         String passWord = amaryllis.getPassword();
-        if(TextUtils.isEmpty(uid) == false && TextUtils.isEmpty(passWord) == false){
+        if(uid.length()!=2 && passWord.length()!=2){
             signUpService.accountLogin(uid,passWord);
             Intent intent = new Intent(getApplication(), MainActivity.class);
             startActivity(intent);
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 6e11875..40b7ea3 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
@@ -19,6 +19,9 @@
 import android.os.Environment;
 import android.util.Base64;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.util.Log;
@@ -48,6 +51,7 @@
 import org.ntlab.amaryllis.client.MyDialogFragment;
 import org.ntlab.amaryllis.client.R;
 import org.ntlab.amaryllis.client.VoiceActivity;
+import org.ntlab.amaryllis.client.entities.Category;
 import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.entities.Voicememo;
@@ -58,6 +62,7 @@
 import java.io.FileInputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import retrofit2.Call;
@@ -94,6 +99,8 @@
     //private short[] shortData = new short[2048];
     private int bufSize;
     LocationManager locationManager;
+    ArrayList<String> checkedList = new ArrayList<>();
+    HashMap<Integer,String> menuItemMap = new HashMap<>();
 
     public MapsFragment() {
     }
@@ -459,6 +466,46 @@
         return timeLabel;
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        HashMap<String,Category> categories = MainActivity.getCategories();
+
+        for(Category category : categories.values()){
+            String name = category.getName();
+            String cid = category.getcId();
+            MenuItem newItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, name);
+            menuItemMap.put(newItem.getItemId(),cid);
+            newItem.setCheckable(true);
+            newItem.setChecked(true);
+            checkedList.add(cid);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        String cid = menuItemMap.get(item.getItemId());
+
+        item.setChecked(!item.isChecked());
+        if(item.isChecked()){
+            checkedList.remove(cid);
+        }else{
+            checkedList.add(cid);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public ArrayList getCheckedCidList() {
+        return checkedList;
+    }
+
 }