diff --git a/source-code/app/src/main/AndroidManifest.xml b/source-code/app/src/main/AndroidManifest.xml
index df2917d1..bb84f340 100755
--- a/source-code/app/src/main/AndroidManifest.xml
+++ b/source-code/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:windowSoftInputMode="adjustResize|adjustPan">
         <activity
             android:name=".activity.HomeActivity"
             android:configChanges="orientation|screenSize"
@@ -39,14 +40,15 @@
         </activity>
         <activity
             android:name=".activity.TemplateEditor"
-            android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_template_editor"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activity.FirstRunActivity"
             android:label="@string/app_name"
             android:theme="@style/SplashTheme"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java
index b2d07bdc..f34e3d57 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java
@@ -9,6 +9,7 @@
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import android.widget.Button;
 import android.widget.EditText;
 
 import com.crashlytics.android.Crashlytics;
@@ -27,6 +28,7 @@ public class FirstRunActivity extends AppCompatActivity {
     private static final String FIRST_RUN = "first_run";
 
     private EditText name;
+    private Button proceed;
     private SharedPreferences prefs;
 
     /**
@@ -45,8 +47,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         findViewById(R.id.focus_thief).clearFocus();
-        Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
+        Animation anim_bounceinup = AnimationUtils.loadAnimation(getBaseContext(), R.anim.bounceinup);
         name = (EditText) findViewById(R.id.first_name);
+        assert name != null;
         name.startAnimation(anim_bounceinup);
         name.setOnKeyListener(new View.OnKeyListener() {
             @Override
@@ -56,27 +59,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                         case KeyEvent.KEYCODE_DPAD_CENTER:
                         case KeyEvent.KEYCODE_ENTER:
 
-                            if (name.getText().toString().equals("")) {
-                                name.setError(getApplicationContext().getResources().getString(R.string.enter_name));
-                                return false;
-                            }
-                            else if(!Character.isLetterOrDigit(name.getText().toString().charAt(0)))
-                            {
-                                name.setError(getApplicationContext().getResources().getString(R.string.valid_msg));
-                                return false;
-                            }
-
-
-                            SharedPreferences.Editor editor = prefs.edit();
-
-                            editor.putString(getString(R.string.key_user_name), name.getText().toString());
-                            editor.putBoolean(FIRST_RUN, true);
-                            editor.apply();
-                            Intent intent = new Intent(getApplicationContext(), TutorialActivity.class);
-                            intent.putExtra(Constants.START_ACTIVITY, true);
-                            startActivity(intent);
-                            finish();
-                            return true;
+                            return validateUser();
                         default:
                             break;
                     }
@@ -84,6 +67,37 @@ else if(!Character.isLetterOrDigit(name.getText().toString().charAt(0)))
                 return false;
             }
         });
+
+        proceed = (Button) findViewById(R.id.proceed);
+
+        proceed.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                validateUser();
+            }
+        });
+    }
+
+    boolean validateUser() {
+        if (name.getText().toString().equals("")) {
+            name.setError(getApplicationContext().getResources().getString(R.string.enter_name));
+            return false;
+        } else if (!Character.isLetterOrDigit(name.getText().toString().charAt(0))) {
+            name.setError(getApplicationContext().getResources().getString(R.string.valid_msg));
+            return false;
+        }
+
+
+        SharedPreferences.Editor editor = prefs.edit();
+
+        editor.putString(getString(R.string.key_user_name), name.getText().toString());
+        editor.putBoolean(FIRST_RUN, true);
+        editor.apply();
+        Intent intent = new Intent(getApplicationContext(), TutorialActivity.class);
+        intent.putExtra(Constants.START_ACTIVITY, true);
+        startActivity(intent);
+        finish();
+        return true;
     }
 
 }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java
index 7deff8d2..3bf5970e 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java
@@ -8,6 +8,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.RadioButton;
@@ -49,7 +50,7 @@ public ComprehensionTemplate() {
         metaData = new ArrayList<>();
     }
 
-    private static boolean validated( Context context, EditText title, EditText passage, EditText timer) {
+    private static boolean validated(Context context, EditText title, EditText passage, EditText timer) {
         if (title == null || passage == null || timer == null) {
             return false;
         }
@@ -64,10 +65,10 @@ private static boolean validated( Context context, EditText title, EditText pass
         } else if ("".equals(passageText)) {
             passage.setError(context.getString(R.string.comprehension_template_passage_hint));
             return false;
-        }else if (timerText.length() > 9) {
+        } else if (timerText.length() > 9) {
             timer.setError(context.getString(R.string.comprehension_template_timer_correct_hint));
             return false;
-        }else if ("0".equals(timerText)) {
+        } else if ("0".equals(timerText)) {
             timer.setError((context.getString(R.string.time_zero_error)));
             return false;
         } else if ("".equals(timerText)) {
@@ -177,6 +178,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.quiz_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText question = (EditText) dialogView.findViewById(R.id.quiz_question);
         final ArrayList<RadioButton> buttons = new ArrayList<>();
@@ -212,28 +214,28 @@ public void onClick(View v) {
                     return;
                 }
 
-                if(options.get(0).getText().toString().trim().equals("")){
+                if (options.get(0).getText().toString().trim().equals("")) {
                     options.get(0).setError(activity.getString(R.string.cannot_be_empty));
                     isValidated = false;
                     return;
                 }
-                if(options.get(1).getText().toString().trim().equals("")){
+                if (options.get(1).getText().toString().trim().equals("")) {
                     options.get(1).setError(activity.getString(R.string.cannot_be_empty));
                     isValidated = false;
                     return;
                 }
-                if(options.get(2).getText().toString().trim().equals("") && !options.get(3).getText().toString().trim().equals("")){
+                if (options.get(2).getText().toString().trim().equals("") && !options.get(3).getText().toString().trim().equals("")) {
                     options.get(2).hasFocus();
                     options.get(2).setError(activity.getString(R.string.comprehension_select_option_3_first));
                     isValidated = false;
                     return;
                 }
 
-                for(int i=0;i<options.size();i++){
-                    for(int j=0;j<i;j++){
+                for (int i = 0; i < options.size(); i++) {
+                    for (int j = 0; j < i; j++) {
                         if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
                             Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
-                            isValidated=false;
+                            isValidated = false;
                         }
                     }
                 }
@@ -249,11 +251,11 @@ public void onClick(View v) {
                 }
 
                 for (EditText option : options) {
-                    if ("".equals(option.getText().toString().trim())){
+                    if ("".equals(option.getText().toString().trim())) {
                         option.setText("");
                         continue;
                     }
-                    if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {
+                    if (option.getText().toString() != null && "".equals(option.getText().toString().trim())) {
                         option.getText().clear();
                         option.setError(activity.getString(R.string.comprehension_template_valid_option));
                         isValidated = false;
@@ -297,6 +299,7 @@ public void addMetaData(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText title = (EditText) dialogView.findViewById(R.id.meta_title);
         final EditText passage = (EditText) dialogView.findViewById(R.id.meta_passage);
@@ -321,7 +324,7 @@ public void fileSelected(File file) {
             @Override
             public void onClick(View v) {
 
-                if (validated(activity,title, passage, timer)) {
+                if (validated(activity, title, passage, timer)) {
 
                     String titleText = title.getText().toString().trim();
                     String passageText = passage.getText().toString().trim();
@@ -352,6 +355,7 @@ public void editItem(final Activity activity, final int position) {
                     .setNegativeButton(R.string.info_template_cancel, null)
                     .create();
             dialog.show();
+            dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
             final ComprehensionMetaModel data = metaData.get(0);
 
@@ -381,7 +385,7 @@ public void fileSelected(File file) {
                 @Override
                 public void onClick(View v) {
 
-                    if (validated(activity,title, passage, timer)) {
+                    if (validated(activity, title, passage, timer)) {
 
                         String titleText = title.getText().toString().trim();
                         String passageText = passage.getText().toString().trim();
@@ -453,17 +457,17 @@ public void onClick(View v) {
                         isValidated = false;
                     }
 
-                    if(options.get(0).getText().toString().trim().equals("")){
+                    if (options.get(0).getText().toString().trim().equals("")) {
                         options.get(0).setError(activity.getString(R.string.cannot_be_empty));
                         isValidated = false;
                         return;
                     }
-                    if(options.get(1).getText().toString().trim().equals("")){
+                    if (options.get(1).getText().toString().trim().equals("")) {
                         options.get(1).setError(activity.getString(R.string.cannot_be_empty));
                         isValidated = false;
                         return;
                     }
-                    if(options.get(2).getText().toString().trim().equals("") && !options.get(3).getText().toString().trim().equals("")){
+                    if (options.get(2).getText().toString().trim().equals("") && !options.get(3).getText().toString().trim().equals("")) {
                         options.get(2).hasFocus();
                         options.get(2).setError(activity.getString(R.string.comprehension_select_option_3_first));
                         isValidated = false;
@@ -480,11 +484,11 @@ public void onClick(View v) {
                     }
 
                     for (EditText option : options) {
-                        if ("".equals(option.getText().toString().trim())){
+                        if ("".equals(option.getText().toString().trim())) {
                             option.setText("");
                             continue;
                         }
-                        if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {
+                        if (option.getText().toString() != null && "".equals(option.getText().toString().trim())) {
                             option.getText().clear();
                             option.setError(activity.getString(R.string.comprehension_template_valid_option));
                             isValidated = false;
@@ -515,8 +519,8 @@ public void onClick(View v) {
 
     @Override
     public Object deleteItem(Activity activity, int position) {
-        ComprehensionMetaModel comprehensionMetaModel =null;
-        ComprehensionModel comprehensionModel=null;
+        ComprehensionMetaModel comprehensionMetaModel = null;
+        ComprehensionModel comprehensionModel = null;
         if (position == -2) {
             comprehensionMetaModel = metaData.get(0);
             metaData.remove(0);
@@ -528,36 +532,28 @@ public Object deleteItem(Activity activity, int position) {
             setEmptyView(activity);
             adapter.notifyDataSetChanged();
         }
-        if (comprehensionMetaModel==null)
-        {
+        if (comprehensionMetaModel == null) {
             return comprehensionModel;
-        }else
-        {
+        } else {
             return comprehensionMetaModel;
         }
     }
 
     @Override
     public void restoreItem(Activity activity, int position, Object object) {
-        if (position==-2)
-        {
-            if (object instanceof ComprehensionMetaModel)
-            {
-                ComprehensionMetaModel comprehensionMetaModel = (ComprehensionMetaModel)object;
-                if (comprehensionMetaModel!=null)
-                {
+        if (position == -2) {
+            if (object instanceof ComprehensionMetaModel) {
+                ComprehensionMetaModel comprehensionMetaModel = (ComprehensionMetaModel) object;
+                if (comprehensionMetaModel != null) {
                     metaData.add(comprehensionMetaModel);
                     metaAdapter.notifyDataSetChanged();
                 }
             }
-        }else
-        {
-            if (object instanceof ComprehensionModel)
-            {
-                ComprehensionModel comprehensionModel = (ComprehensionModel)object;
-                if (comprehensionModel!=null)
-                {
-                    comprehensionData.add(position,comprehensionModel);
+        } else {
+            if (object instanceof ComprehensionModel) {
+                ComprehensionModel comprehensionModel = (ComprehensionModel) object;
+                if (comprehensionModel != null) {
+                    comprehensionData.add(position, comprehensionModel);
                     adapter.notifyDataSetChanged();
                 }
             }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java
index 975a8a73..e4ea5ace 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java
@@ -7,6 +7,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -123,6 +124,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText title = (EditText) dialogView.findViewById(R.id.dict_title);
         final EditText passage = (EditText) dialogView.findViewById(R.id.dict_passage);
@@ -184,6 +186,7 @@ public void editItem(final Activity activity, final int position) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final DictationModel data = dictData.get(position);
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java
index 376848ff..6ba36d44 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java
@@ -15,6 +15,7 @@
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -126,6 +127,8 @@ public void addItem(final Activity activity) {
                 .create();
         dialog.show();
 
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+
         final EditText question = (EditText) dialogView.findViewById(R.id.flash_question);
         final EditText answer = (EditText) dialogView.findViewById(R.id.flash_answer);
         final EditText answerHint = (EditText) dialogView.findViewById(R.id.flash_hint);
@@ -248,9 +251,11 @@ private boolean validateData(EditText question, EditText answer, Context context
 
         if ("".equals(questionText)) {
             question.setError(context.getString(R.string.enter_question));
+            question.requestFocus();
             return false;
         } else if ("".equals(answerText)) {
             answer.setError(context.getString(R.string.enter_answer));
+            answer.requestFocus();
             return false;
         } else if (!mIsPhotoAttached) {
             Toast.makeText(context, context.getString(R.string.flash_template_attach_image), Toast.LENGTH_SHORT).show();
@@ -272,12 +277,10 @@ public Object deleteItem(Activity activity, int position) {
 
     @Override
     public void restoreItem(Activity activity, int position, Object object) {
-        if (object instanceof FlashCardModel)
-        {
-            FlashCardModel flashCardModel = (FlashCardModel)object;
-            if (flashCardModel!=null)
-            {
-                mData.add(position,flashCardModel);
+        if (object instanceof FlashCardModel) {
+            FlashCardModel flashCardModel = (FlashCardModel) object;
+            if (flashCardModel != null) {
+                mData.add(position, flashCardModel);
                 mAdapter.notifyDataSetChanged();
             }
         }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java
index 00d77f2d..6dcc67b6 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java
@@ -7,6 +7,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 
@@ -119,6 +120,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText word = (EditText) dialogView.findViewById(R.id.info_word);
         final EditText meaning = (EditText) dialogView.findViewById(R.id.info_meaning);
@@ -162,6 +164,7 @@ public void editItem(final Activity activity, int position) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final InfoModel data = infoData.get(position);
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java
index 8566d942..33ab4e56 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java
@@ -7,6 +7,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 
@@ -119,6 +120,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText word = (EditText) dialogView.findViewById(R.id.info_word);
         final EditText meaning = (EditText) dialogView.findViewById(R.id.info_meaning);
@@ -162,6 +164,7 @@ public void editItem(final Activity activity, int position) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final LearnSpellingModel data = mLearnSpellingData.get(position);
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java
index 39ec3733..4989e941 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java
@@ -8,6 +8,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -162,6 +163,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.quiz_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText first_list_item = (EditText) dialogView.findViewById(R.id.first_list_item);
         final EditText second_list_item = (EditText) dialogView.findViewById(R.id.second_list_item);
@@ -200,6 +202,7 @@ public void addMetaData(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText title = (EditText) dialogView.findViewById(R.id.meta_title);
         final EditText first_list_title = (EditText) dialogView.findViewById(R.id.meta_first_list_title);
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java
index 36eb4eb1..4885691e 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java
@@ -7,6 +7,7 @@
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.RadioButton;
@@ -111,6 +112,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.quiz_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText question = (EditText) dialogView.findViewById(R.id.quiz_question);
         final ArrayList<RadioButton> buttons = new ArrayList<>();
@@ -237,6 +239,7 @@ public void editItem(final Activity activity, final int position) {
                 .setNegativeButton(R.string.quiz_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText question = (EditText) dialogView.findViewById(R.id.quiz_question);
         final ArrayList<RadioButton> buttons = new ArrayList<>();
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java
index 04f1c87e..27975b36 100644
--- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java
+++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java
@@ -11,6 +11,7 @@
 import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -212,6 +213,7 @@ public void addItem(final Activity activity) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final EditText link = (EditText) dialogView.findViewById(R.id.video_link);
 
@@ -260,6 +262,7 @@ public void editItem(final Activity activity, final int position) {
                 .setNegativeButton(R.string.info_template_cancel, null)
                 .create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         final VideoModel data = videoData.get(position);
 
diff --git a/source-code/app/src/main/res/layout/activity_first_run.xml b/source-code/app/src/main/res/layout/activity_first_run.xml
index 884e9564..bce6e5fb 100644
--- a/source-code/app/src/main/res/layout/activity_first_run.xml
+++ b/source-code/app/src/main/res/layout/activity_first_run.xml
@@ -1,72 +1,86 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:font="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="org.buildmlearn.toolkit.activity.FirstRunActivity">
+    android:fillViewport="true"
+    android:scrollbars="vertical">
 
-    <ImageView
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/buildmlearn_backdrop_image"
-        android:scaleType="centerCrop"
-        android:src="@drawable/first_run_bg" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/buildmlearn_logo"
-            android:scaleType="centerCrop"
-            android:src="@drawable/logo_70" />
-
-        <org.buildmlearn.toolkit.views.TextViewPlus
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/main_title"
-            android:textColor="@color/white_secondary_text"
-            android:textSize="@dimen/headline_leading"
-            font:customFont="roboto_light.ttf" />
+            android:layout_height="match_parent"
+            android:contentDescription="@string/buildmlearn_backdrop_image"
+            android:src="@drawable/first_run_bg" />
 
-        <org.buildmlearn.toolkit.views.TextViewPlus
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/main_subtitle"
-            android:textColor="@color/white_secondary_text"
-            android:textSize="@dimen/title"
-            font:customFont="roboto_light.ttf" />
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <View
-            android:id="@+id/focus_thief"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            android:focusable="true"
-            android:focusableInTouchMode="true" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/buildmlearn_logo"
+                android:scaleType="centerCrop"
+                android:src="@drawable/logo_70" />
 
-        <EditText
-            android:id="@+id/first_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="50dp"
-            android:ems="10"
-            
-            android:hint="@string/main_name_hint"
-            android:inputType="textPersonName"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:textColorHint="@color/white_hint_text_disabled" />
+            <org.buildmlearn.toolkit.views.TextViewPlus
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@string/main_title"
+                android:textColor="@color/white_secondary_text"
+                android:textSize="@dimen/headline_leading"
+                font:customFont="roboto_light.ttf" />
+
+            <org.buildmlearn.toolkit.views.TextViewPlus
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@string/main_subtitle"
+                android:textColor="@color/white_secondary_text"
+                android:textSize="@dimen/title"
+                font:customFont="roboto_light.ttf" />
+
+            <View
+                android:id="@+id/focus_thief"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
+                android:focusable="true"
+                android:focusableInTouchMode="true" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="48dp"
+                android:gravity="center"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
+                <EditText
+                    android:id="@+id/first_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/main_name_hint"
+                    android:inputType="textPersonName"
+                    android:textColorHint="@color/white_hint_text_disabled" />
 
+                <Button
+                    android:id="@+id/proceed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proceed" />
+            </LinearLayout>
 
-    </LinearLayout>
+        </LinearLayout>
 
-</RelativeLayout>
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/source-code/app/src/main/res/layout/flash_dialog_add_edit_item.xml b/source-code/app/src/main/res/layout/flash_dialog_add_edit_item.xml
index 6bb3e99b..2605d981 100644
--- a/source-code/app/src/main/res/layout/flash_dialog_add_edit_item.xml
+++ b/source-code/app/src/main/res/layout/flash_dialog_add_edit_item.xml
@@ -1,75 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent"
+    android:scrollbars="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginBottom="10dp">
-
-        <ImageView
-            android:id="@+id/banner_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/upload_image"
-            android:scaleType="centerCrop"
-            android:src="@drawable/bg_card" />
-
-        <ImageView
-            android:id="@+id/flash_upload_image"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/upload_image"
-            android:scaleType="centerCrop"
-            android:src="@drawable/upload_button" />
-    </RelativeLayout>
+            android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/banner_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/upload_image"
+                android:scaleType="centerCrop"
+                android:src="@drawable/bg_card" />
 
-    <TextView
-        style="@style/TextView.Caption.Light"
-        android:text="@string/flash_templete_question"
-        android:textColor="@color/black_secondary_text" />
+            <ImageView
+                android:id="@+id/flash_upload_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/upload_image"
+                android:scaleType="centerCrop"
+                android:src="@drawable/upload_button" />
+        </RelativeLayout>
 
-    <EditText
-        android:id="@+id/flash_question"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/flash_template_question_hint"
-        android:inputType="textPersonName" />
 
-    <TextView
-        style="@style/TextView.Caption.Light"
-        android:text="@string/flash_template_answer"
-        android:textColor="@color/black_secondary_text" />
+        <TextView
+            style="@style/TextView.Caption.Light"
+            android:text="@string/flash_templete_question"
+            android:textColor="@color/black_secondary_text" />
 
+        <EditText
+            android:id="@+id/flash_question"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/flash_template_question_hint"
+            android:inputType="textPersonName" />
 
-    <EditText
-        android:id="@+id/flash_answer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/flash_template_anser_hint"
-        android:inputType="textPersonName" />
+        <TextView
+            style="@style/TextView.Caption.Light"
+            android:text="@string/flash_template_answer"
+            android:textColor="@color/black_secondary_text" />
 
-    <TextView
-        style="@style/TextView.Caption.Light"
-        android:text="@string/flash_template_hint"
-        android:textColor="@color/black_secondary_text" />
 
+        <EditText
+            android:id="@+id/flash_answer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/flash_template_anser_hint"
+            android:inputType="textPersonName" />
+
+        <TextView
+            style="@style/TextView.Caption.Light"
+            android:text="@string/flash_template_hint"
+            android:textColor="@color/black_secondary_text" />
+
+
+        <EditText
+            android:id="@+id/flash_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/flash_template_hint_hint"
+            android:inputType="textPersonName" />
 
-    <EditText
-        android:id="@+id/flash_hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/flash_template_hint_hint"
-        android:inputType="textPersonName" />
 
     </LinearLayout>
 
diff --git a/source-code/app/src/main/res/values/strings.xml b/source-code/app/src/main/res/values/strings.xml
index 0139f918..41153b3a 100644
--- a/source-code/app/src/main/res/values/strings.xml
+++ b/source-code/app/src/main/res/values/strings.xml
@@ -420,5 +420,6 @@
     <string name="pref_tell_key">tell</string>
     <string name="pref_tell_title">Tell a friend</string>
     <string name="pref_tell_message">BuildmLearn Toolkit for your phone. Download it from here :</string>
+    <string name="proceed">Proceed</string>
 </resources>
 
diff --git a/source-code/build.gradle b/source-code/build.gradle
index f3f75cbd..18cedec8 100644
--- a/source-code/build.gradle
+++ b/source-code/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files