diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..b4967251
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+    "configurations": [
+    {
+        "name": "Flutter",
+        "type": "dart",
+        "request": "launch",
+        "program": "lib/main.dart"
+    }
+    ]
+}
\ No newline at end of file
diff --git a/lib/screens/options.dart b/lib/screens/options.dart
index 80e5a9f0..76642eab 100644
--- a/lib/screens/options.dart
+++ b/lib/screens/options.dart
@@ -118,7 +118,7 @@ class _OptionsState extends State<Options> {
             ),
             SizedBox(height: 15.toHeight),
             Divider(height: 1),
-            SizedBox(height: 5.toHeight),
+            SizedBox(height: 15.toHeight),
             InkWell(
               onTap: () async {
                 BackupKeyWidget(
@@ -130,7 +130,7 @@ class _OptionsState extends State<Options> {
               },
               child: Row(
                 children: <Widget>[
-                  Icon(Icons.file_copy, size: 25),
+                  Icon(Icons.file_copy, size: 23),
                   Expanded(
                     child: Padding(
                       padding: const EdgeInsets.only(left: 8.0),
@@ -146,21 +146,27 @@ class _OptionsState extends State<Options> {
             SizedBox(height: 15.toHeight),
             Divider(height: 1),
             SizedBox(
-              height: 40,
+              height: 38,
               width: SizeConfig().screenWidth,
               child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
                 children: <Widget>[
-                  Icon(Icons.lock, size: 25),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0.0, 13.0, 0.0, 0.0),
+                    child: Icon(Icons.lock, size: 25),
+                  ),
                   Expanded(
                     child: Padding(
-                      padding: const EdgeInsets.only(left: 8.0),
+                      padding: EdgeInsets.fromLTRB(8.0, 15.0, 0.0, 0.0),
                       child: Text(
                         'Private Account',
                         style: TextStyles.lightText(_themeData!.primaryColor),
                       ),
                     ),
                   ),
-                  Provider.of<SetPrivateState>(context).isLoading
+                  Padding(
+                      padding: EdgeInsets.fromLTRB(8.0, 15.0, 0.0, 0.0),
+                      child: Provider.of<SetPrivateState>(context).isLoading
                       ? LoadingDialog().onlyText(
                           'Updating',
                           style: TextStyle(
@@ -170,6 +176,7 @@ class _OptionsState extends State<Options> {
                               decoration: TextDecoration.none),
                         )
                       : Transform.scale(
+                          alignment: Alignment.center,
                           scale: 0.7,
                           child: CupertinoSwitch(
                             activeColor: WaviColors.ColorConstants.black,
@@ -181,12 +188,13 @@ class _OptionsState extends State<Options> {
                             },
                           ),
                         ),
+                  ),
                 ],
               ),
             ),
             SizedBox(height: 15.toHeight),
             Divider(height: 1),
-            SizedBox(height: 5.toHeight),
+            SizedBox(height: 15.toHeight),
             InkWell(
               onTap: () {
                 SetupRoutes.push(context, Routes.TERMS_CONDITIONS_SCREEN);
@@ -215,7 +223,7 @@ class _OptionsState extends State<Options> {
             ),
             SizedBox(height: 15.toHeight),
             Divider(height: 1),
-            SizedBox(height: 15.toHeight),
+            SizedBox(height: 14.toHeight),
             InkWell(
               onTap: () {
                 SetupRoutes.push(context, Routes.FAQS);
@@ -242,9 +250,9 @@ class _OptionsState extends State<Options> {
                 ],
               ),
             ),
-            SizedBox(height: 15.toHeight),
+            SizedBox(height: 14.toHeight),
             Divider(height: 1),
-            SizedBox(height: 15.toHeight),
+            SizedBox(height: 14.toHeight),
             InkWell(
               onTap: () {
                 _showResetDialog();
@@ -268,9 +276,9 @@ class _OptionsState extends State<Options> {
                 ],
               ),
             ),
-            SizedBox(height: 15.toHeight),
+            SizedBox(height: 14.toHeight),
             Divider(height: 1),
-            SizedBox(height: 15.toHeight),
+            SizedBox(height: 14.toHeight),
             InkWell(
               onTap: () async {
                 var atSignList = await KeychainUtil.getAtsignList();