diff --git a/src/MistoxWebsite.Client/Pages/Shared/NotAuthroized.razor b/src/MistoxWebsite.Client/Pages/Shared/NotAuthroized.razor
index a9a554b..476c7b0 100755
--- a/src/MistoxWebsite.Client/Pages/Shared/NotAuthroized.razor
+++ b/src/MistoxWebsite.Client/Pages/Shared/NotAuthroized.razor
@@ -7,7 +7,7 @@
 @code {
     protected override void OnInitialized() {
         if (Statics.User.ID == -1 ) {
-            Nav.NavigateTo( "/account/login?ReturnURL=Null" );
+            Nav.NavigateTo( "/account/login" );
         }
     }
 }
diff --git a/src/MistoxWebsite.Client/Pages/Store/Cart.razor b/src/MistoxWebsite.Client/Pages/Store/Cart.razor
index 3bbeee8..45adf1d 100755
--- a/src/MistoxWebsite.Client/Pages/Store/Cart.razor
+++ b/src/MistoxWebsite.Client/Pages/Store/Cart.razor
@@ -4,7 +4,7 @@
 <h3 class="cart-title">Cart</h3>
 
 <div class="Spacer">
-    @foreach( MistoxWebsite.Shared.Cart obj in Statics.Carts ) {
+    @foreach( MistoxWebsite.Shared.Database.Cart obj in Statics.Carts ) {
         <div class="cart-item">
             <h1>@getItem(obj.ProductID)?.Name</h1>
             @foreach( string cur in getItem( obj.ProductID )?.Images ) {
@@ -43,7 +43,7 @@
 
     protected override void OnInitialized() {
         total = 0;
-        foreach( MistoxWebsite.Shared.Cart obj in Statics.Carts ) {
+        foreach( MistoxWebsite.Shared.Database.Cart obj in Statics.Carts ) {
             foreach( Product item in Statics.Products ) {
                 if( obj.ProductID == item.ID ) {
                     total = total + (item.Cost / 100f);
diff --git a/src/MistoxWebsite.Client/Pages/Store/Catalog.razor b/src/MistoxWebsite.Client/Pages/Store/Catalog.razor
index 212c4d1..eb1dda8 100755
--- a/src/MistoxWebsite.Client/Pages/Store/Catalog.razor
+++ b/src/MistoxWebsite.Client/Pages/Store/Catalog.razor
@@ -99,7 +99,7 @@
 
     public bool isOwned(int ID ) {
         if(Statics.Owned.Count > 0 ) {
-            foreach( MistoxWebsite.Shared.Receipt cur in Statics.Owned ) {
+            foreach( MistoxWebsite.Shared.Database.Receipt cur in Statics.Owned ) {
                 if( cur.ProductID == ID ) {
                     return true;
                 }
@@ -109,7 +109,7 @@
     }
 
     public bool isInCart(int id) {
-        foreach( MistoxWebsite.Shared.Cart cur in Statics.Carts ) {
+        foreach( MistoxWebsite.Shared.Database.Cart cur in Statics.Carts ) {
             if (cur.ProductID == id ) {
                 return true;
             }
@@ -118,7 +118,7 @@
     }
 
     public async void onAddToCart( int ID ) {
-        MistoxWebsite.Shared.Cart item = new MistoxWebsite.Shared.Cart {
+        MistoxWebsite.Shared.Database.Cart item = new MistoxWebsite.Shared.Database.Cart {
             ProductID = ID,
             AccountID = Statics.User.ID
         };