diff --git a/Note-masters/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Note-masters/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..cd3c0c0 100644
--- a/Note-masters/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/Note-masters/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -507,11 +507,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_new_note:
-                createNewNote();
-                break;
-            case R.id.menu_delete:
+        int id = item.getItemId();
+
+             if (id ==R.id.menu_new_note) {
+                 createNewNote();
+
+             }else if (id ==R.id.menu_delete){
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
                 builder.setTitle(getString(R.string.alert_title_delete));
                 builder.setIcon(android.R.drawable.ic_dialog_alert);
@@ -525,31 +526,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         });
                 builder.setNegativeButton(android.R.string.cancel, null);
                 builder.show();
-                break;
-            case R.id.menu_font_size:
-                mFontSizeSelector.setVisibility(View.VISIBLE);
-                findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
-                break;
-            case R.id.menu_list_mode:
-                mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
-                        TextNote.MODE_CHECK_LIST : 0);
-                break;
-            case R.id.menu_share:
-                getWorkingText();
-                sendTo(this, mWorkingNote.getContent());
-                break;
-            case R.id.menu_send_to_desktop:
-                sendToDesktop();
-                break;
-            case R.id.menu_alert:
-                setReminder();
-                break;
-            case R.id.menu_delete_remind:
-                mWorkingNote.setAlertDate(0, false);
-                break;
-            default:
-                break;
-        }
+
+            } else if (id ==R.id.menu_font_size) {
+                 mFontSizeSelector.setVisibility(View.VISIBLE);
+                 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+             }
+            else if (id ==R.id.menu_list_mode) {
+                 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
+                         TextNote.MODE_CHECK_LIST : 0);
+             }
+             else if (id ==R.id.menu_share) {
+                 getWorkingText();
+                 sendTo(this, mWorkingNote.getContent());
+             }
+             else if (id ==R.id.menu_send_to_desktop) {
+                 sendToDesktop();
+             }
+            else if (id ==R.id.menu_alert) {
+                 setReminder();
+             }
+            else if (id ==R.id.menu_delete_remind) {
+                 mWorkingNote.setAlertDate(0, false);
+             }
+
         return true;
     }
 
diff --git a/Note-masters/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Note-masters/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..49f180b 100644
--- a/Note-masters/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/Note-masters/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -318,30 +318,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                         Toast.LENGTH_SHORT).show();
                 return true;
             }
-
-            switch (item.getItemId()) {
-                case R.id.delete:
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(getString(R.string.alert_title_delete));
-                    builder.setIcon(android.R.drawable.ic_dialog_alert);
-                    builder.setMessage(getString(R.string.alert_message_delete_notes,
-                                             mNotesListAdapter.getSelectedCount()));
-                    builder.setPositiveButton(android.R.string.ok,
-                                             new DialogInterface.OnClickListener() {
-                                                 public void onClick(DialogInterface dialog,
-                                                         int which) {
-                                                     batchDelete();
-                                                 }
-                                             });
-                    builder.setNegativeButton(android.R.string.cancel, null);
-                    builder.show();
-                    break;
-                case R.id.move:
-                    startQueryDestinationFolders();
-                    break;
-                default:
-                    return false;
-            }
+            int id = item.getItemId();
+           if  (id==R.id.delete) {
+
+               AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+               builder.setTitle(getString(R.string.alert_title_delete));
+               builder.setIcon(android.R.drawable.ic_dialog_alert);
+               builder.setMessage(getString(R.string.alert_message_delete_notes,
+                       mNotesListAdapter.getSelectedCount()));
+               builder.setPositiveButton(android.R.string.ok,
+                       new DialogInterface.OnClickListener() {
+                           public void onClick(DialogInterface dialog,
+                                               int which) {
+                               batchDelete();
+                           }
+                       });
+               builder.setNegativeButton(android.R.string.cancel, null);
+               builder.show();
+           }
+           else if  (id==R.id.move) {
+               startQueryDestinationFolders();
+           }
             return true;
         }
     }
@@ -558,12 +555,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btn_new_note:
-                createNewNote();
-                break;
-            default:
-                break;
+        int id = v.getId();
+        if (id == R.id.btn_new_note) {
+            createNewNote();
         }
     }
 
@@ -780,16 +774,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_new_folder: {
+        int id = item.getItemId();
+
+            if (id==R.id.menu_new_folder) {
                 showCreateOrModifyFolderDialog(true);
-                break;
+
             }
-            case R.id.menu_export_text: {
+            else if (id==R.id.menu_export_text)  {
                 exportNoteToText();
-                break;
+
             }
-            case R.id.menu_sync: {
+             else if (id==R.id.menu_sync)  {
                 if (isSyncMode()) {
                     if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
                         GTaskSyncService.startSync(this);
@@ -799,22 +794,20 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 } else {
                     startPreferenceActivity();
                 }
-                break;
+
             }
-            case R.id.menu_setting: {
+            else if (id==R.id.menu_setting) {
                 startPreferenceActivity();
-                break;
+
             }
-            case R.id.menu_new_note: {
+            else if (id==R.id.menu_new_note) {
                 createNewNote();
-                break;
+
             }
-            case R.id.menu_search:
+            else if (id==R.id.menu_search) {
                 onSearchRequested();
-                break;
-            default:
-                break;
-        }
+            }
+
         return true;
     }