diff --git a/lib/globals.dart b/lib/globals.dart
index e500877..0976305 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -13,6 +13,8 @@ SharedPreferences prefs;
 String endPointGVA;
 int ramSys;
 
+String cesiumPod = "https://g1.data.le-sou.org";
+
 // Responsive ratios
 bool isTall;
 double ratio;
diff --git a/lib/models/cesiumPlus.dart b/lib/models/cesiumPlus.dart
index 7cbe5e4..9084773 100644
--- a/lib/models/cesiumPlus.dart
+++ b/lib/models/cesiumPlus.dart
@@ -51,7 +51,7 @@ class CesiumPlusProvider with ChangeNotifier {
       "indices_boost": {"user": 100, "page": 1, "group": 0.01}
     });
 
-    String cesiumPod = "https://g1.data.le-sou.org";
+    
     String requestUrl = "/user,page,group/profile,record/_search";
     String podRequest = cesiumPod + requestUrl;
 
diff --git a/lib/models/queries.dart b/lib/models/queries.dart
index 72ba0e9..45e15fd 100644
--- a/lib/models/queries.dart
+++ b/lib/models/queries.dart
@@ -62,3 +62,4 @@ const String getBalance = r'''
       }
     }
   ''';
+
diff --git a/lib/screens/myWallets/unlockingWallet.dart b/lib/screens/myWallets/unlockingWallet.dart
index eb70588..c52fe45 100644
--- a/lib/screens/myWallets/unlockingWallet.dart
+++ b/lib/screens/myWallets/unlockingWallet.dart
@@ -144,7 +144,7 @@ class UnlockingWallet extends StatelessWidget {
                 pinColor = Colors.green[400];
                 // await Future.delayed(Duration(milliseconds: 50));
                 Navigator.push(
-                    context,
+                    formKey.currentContext,
                     SmoothTransition(
                         page: WalletOptions(
                             walletNbr: walletNbr,
diff --git a/lib/screens/myWallets/walletOptions.dart b/lib/screens/myWallets/walletOptions.dart
index 82d96f2..7ae59fa 100644
--- a/lib/screens/myWallets/walletOptions.dart
+++ b/lib/screens/myWallets/walletOptions.dart
@@ -12,7 +12,7 @@ import 'package:provider/provider.dart';
 import 'package:flutter/services.dart';
 
 // ignore: must_be_immutable
-class WalletOptions extends StatelessWidget with ChangeNotifier {
+class WalletOptions extends StatelessWidget {
   WalletOptions(
       {Key keyMyWallets,
       @required this.walletNbr,
@@ -160,7 +160,7 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
                                 variables: {
                                   'pubkey': _walletOptions.pubkey.text,
                                 },
-                                pollInterval: Duration(seconds: 1),
+                                // pollInterval: Duration(seconds: 1),
                               ),
                               builder: (QueryResult result,
                                   {VoidCallback refetch, FetchMore fetchMore}) {
@@ -171,6 +171,10 @@ class WalletOptions extends StatelessWidget with ChangeNotifier {
                                 if (result.isLoading) {
                                   return Text('Loading');
                                 }
+
+                                // TODO: catch links errors
+                                print(result);
+
                                 // List repositories = result.data['viewer']['repositories']['nodes'];
                                 String wBalanceUD;
                                 if (result.data['balance'] == null) {