diff --git a/lib/inventree/company.dart b/lib/inventree/company.dart
index 59246769..2dec8922 100644
--- a/lib/inventree/company.dart
+++ b/lib/inventree/company.dart
@@ -1,5 +1,4 @@
 import "dart:async";
-import "dart:io";
 
 import "package:inventree/api.dart";
 import "package:inventree/inventree/model.dart";
diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index 86856156..9e3e7e21 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -1,24 +1,18 @@
-
-import "package:inventree/api.dart";
-import "package:inventree/app_colors.dart";
-import "package:inventree/app_settings.dart";
-import "package:inventree/inventree/part.dart";
-import "package:inventree/inventree/sentry.dart";
-import 'package:inventree/widget/part_list.dart';
-import "package:inventree/widget/progress.dart";
-
-import "package:inventree/l10.dart";
-
-import "package:inventree/widget/part_detail.dart";
-import "package:inventree/widget/refreshable_state.dart";
-import "package:inventree/widget/paginator.dart";
-
 import "package:flutter/cupertino.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
+
+import "package:inventree/api.dart";
+import "package:inventree/app_colors.dart";
+import "package:inventree/inventree/part.dart";
+import "package:inventree/widget/part_list.dart";
+import "package:inventree/widget/progress.dart";
+import "package:inventree/l10.dart";
+import "package:inventree/widget/part_detail.dart";
+import "package:inventree/widget/refreshable_state.dart";
+
 
 class CategoryDisplayWidget extends StatefulWidget {
 
diff --git a/lib/widget/category_list.dart b/lib/widget/category_list.dart
index e307da4c..33673d6c 100644
--- a/lib/widget/category_list.dart
+++ b/lib/widget/category_list.dart
@@ -1,15 +1,11 @@
+import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
 
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:inventree/inventree/model.dart';
-import 'package:inventree/inventree/part.dart';
-import 'package:inventree/widget/category_display.dart';
-import 'package:inventree/widget/paginator.dart';
-import 'package:inventree/widget/part_list.dart';
-
-import 'package:inventree/widget/refreshable_state.dart';
+import "package:inventree/inventree/model.dart";
+import "package:inventree/inventree/part.dart";
+import "package:inventree/widget/category_display.dart";
+import "package:inventree/widget/paginator.dart";
+import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
 
 class PartCategoryList extends StatefulWidget {
diff --git a/lib/widget/company_list.dart b/lib/widget/company_list.dart
index 6d2a3f4e..c2bb5996 100644
--- a/lib/widget/company_list.dart
+++ b/lib/widget/company_list.dart
@@ -1,18 +1,14 @@
 
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
 
 import "package:inventree/api.dart";
 import "package:inventree/inventree/company.dart";
-import 'package:inventree/inventree/model.dart';
-import "package:inventree/inventree/sentry.dart";
+import "package:inventree/inventree/model.dart";
 import "package:inventree/widget/paginator.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/widget/company_detail.dart";
 
-import "package:inventree/l10.dart";
-
 
 class CompanyListWidget extends StatefulWidget {
 
diff --git a/lib/widget/home.dart b/lib/widget/home.dart
index c58954e7..1a85c711 100644
--- a/lib/widget/home.dart
+++ b/lib/widget/home.dart
@@ -17,7 +17,7 @@ import "package:inventree/widget/category_display.dart";
 import "package:inventree/widget/company_list.dart";
 import "package:inventree/widget/location_display.dart";
 import "package:inventree/widget/purchase_order_list.dart";
-import 'package:inventree/widget/search.dart';
+import "package:inventree/widget/search.dart";
 import "package:inventree/widget/snacks.dart";
 import "package:inventree/widget/drawer.dart";
 
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 17ace857..138d3f04 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -1,22 +1,19 @@
-import "package:inventree/api.dart";
-import "package:inventree/app_colors.dart";
-import "package:inventree/app_settings.dart";
-import "package:inventree/barcode.dart";
-import "package:inventree/inventree/sentry.dart";
-import "package:inventree/inventree/stock.dart";
-import "package:inventree/widget/progress.dart";
-
-import "package:inventree/widget/refreshable_state.dart";
-import "package:inventree/widget/stock_detail.dart";
-import "package:inventree/widget/paginator.dart";
-import "package:inventree/l10.dart";
-
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:flutter/foundation.dart";
+
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
-import 'package:inventree/widget/stock_list.dart';
+
+import "package:inventree/api.dart";
+import "package:inventree/app_colors.dart";
+import "package:inventree/barcode.dart";
+import "package:inventree/inventree/stock.dart";
+import "package:inventree/widget/progress.dart";
+import "package:inventree/widget/refreshable_state.dart";
+import "package:inventree/widget/stock_detail.dart";
+import "package:inventree/l10.dart";
+import "package:inventree/widget/stock_list.dart";
+
 
 class LocationDisplayWidget extends StatefulWidget {
 
diff --git a/lib/widget/location_list.dart b/lib/widget/location_list.dart
index 4bb25ac4..b766ca08 100644
--- a/lib/widget/location_list.dart
+++ b/lib/widget/location_list.dart
@@ -1,17 +1,12 @@
+import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
 
+import "package:inventree/inventree/model.dart";
+import "package:inventree/inventree/stock.dart";
+import "package:inventree/widget/location_display.dart";
+import "package:inventree/widget/paginator.dart";
 
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:inventree/inventree/model.dart';
-import 'package:inventree/inventree/part.dart';
-import 'package:inventree/inventree/stock.dart';
-import 'package:inventree/widget/category_display.dart';
-import 'package:inventree/widget/location_display.dart';
-import 'package:inventree/widget/paginator.dart';
-import 'package:inventree/widget/part_list.dart';
-
-import 'package:inventree/widget/refreshable_state.dart';
+import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
 
 
diff --git a/lib/widget/paginator.dart b/lib/widget/paginator.dart
index d46ec19d..9c6cfdec 100644
--- a/lib/widget/paginator.dart
+++ b/lib/widget/paginator.dart
@@ -1,8 +1,10 @@
 import "package:flutter/material.dart";
+
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
-import 'package:inventree/inventree/model.dart';
-import 'package:inventree/inventree/sentry.dart';
+import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
+
+import "package:inventree/inventree/model.dart";
+import "package:inventree/inventree/sentry.dart";
 import "package:inventree/l10.dart";
 
 
diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index 254e1a53..c31ecffe 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -2,10 +2,11 @@
 import "package:flutter/cupertino.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
+
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
+
 import "package:inventree/app_colors.dart";
 import "package:inventree/inventree/stock.dart";
-
 import "package:inventree/l10.dart";
 import "package:inventree/widget/part_attachments_widget.dart";
 import "package:inventree/widget/part_notes.dart";
@@ -16,9 +17,7 @@ import "package:inventree/api.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/widget/part_image_widget.dart";
 import "package:inventree/widget/stock_detail.dart";
-
-import "package:inventree/widget/location_display.dart";
-import 'package:inventree/widget/stock_list.dart';
+import "package:inventree/widget/stock_list.dart";
 
 
 class PartDetailWidget extends StatefulWidget {
diff --git a/lib/widget/part_list.dart b/lib/widget/part_list.dart
index fc4635f9..a6fb6fef 100644
--- a/lib/widget/part_list.dart
+++ b/lib/widget/part_list.dart
@@ -1,12 +1,10 @@
 import "package:flutter/material.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
-import 'package:inventree/inventree/model.dart';
+
+import "package:inventree/inventree/model.dart";
 import "package:inventree/inventree/part.dart";
-import "package:inventree/inventree/sentry.dart";
 import "package:inventree/widget/paginator.dart";
 import "package:inventree/widget/part_detail.dart";
 import "package:inventree/widget/refreshable_state.dart";
-
 import "package:inventree/api.dart";
 import "package:inventree/app_settings.dart";
 import "package:inventree/l10.dart";
diff --git a/lib/widget/purchase_order_detail.dart b/lib/widget/purchase_order_detail.dart
index 4275bb89..1558ddbc 100644
--- a/lib/widget/purchase_order_detail.dart
+++ b/lib/widget/purchase_order_detail.dart
@@ -1,6 +1,8 @@
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
+
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
+import "package:one_context/one_context.dart";
 
 import "package:inventree/api.dart";
 import "package:inventree/api_form.dart";
@@ -11,10 +13,8 @@ import "package:inventree/inventree/purchase_order.dart";
 import "package:inventree/widget/company_detail.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
-import "package:inventree/widget/location_display.dart";
 import "package:inventree/widget/snacks.dart";
-import 'package:inventree/widget/stock_list.dart';
-import "package:one_context/one_context.dart";
+import "package:inventree/widget/stock_list.dart";
 
 
 class PurchaseOrderDetailWidget extends StatefulWidget {
diff --git a/lib/widget/purchase_order_list.dart b/lib/widget/purchase_order_list.dart
index 0c284cfc..d1a107c9 100644
--- a/lib/widget/purchase_order_list.dart
+++ b/lib/widget/purchase_order_list.dart
@@ -1,10 +1,8 @@
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
 
 import "package:inventree/inventree/company.dart";
-import 'package:inventree/inventree/model.dart';
-import "package:inventree/inventree/sentry.dart";
+import "package:inventree/inventree/model.dart";
 import "package:inventree/widget/paginator.dart";
 import "package:inventree/widget/purchase_order_detail.dart";
 import "package:inventree/widget/refreshable_state.dart";
diff --git a/lib/widget/search.dart b/lib/widget/search.dart
index 7134a3a3..387eb8f3 100644
--- a/lib/widget/search.dart
+++ b/lib/widget/search.dart
@@ -1,25 +1,22 @@
 import "dart:async";
 
-import 'package:inventree/inventree/company.dart';
-import 'package:inventree/inventree/purchase_order.dart';
-import "package:inventree/widget/part_detail.dart";
-import 'package:inventree/widget/part_list.dart';
-import "package:inventree/widget/progress.dart";
-import 'package:inventree/widget/purchase_order_list.dart';
-import 'package:inventree/widget/refreshable_state.dart';
-import "package:inventree/widget/snacks.dart";
-import "package:inventree/widget/stock_detail.dart";
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
+
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
+
+import "package:inventree/inventree/company.dart";
+import "package:inventree/inventree/purchase_order.dart";
+import "package:inventree/widget/part_list.dart";
+import "package:inventree/widget/purchase_order_list.dart";
+import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
 import "package:inventree/inventree/part.dart";
 import "package:inventree/inventree/stock.dart";
-import 'package:inventree/widget/stock_list.dart';
-
-import 'category_list.dart';
-import 'company_list.dart';
-import 'location_list.dart';
+import "package:inventree/widget/stock_list.dart";
+import "package:inventree/widget/category_list.dart";
+import "package:inventree/widget/company_list.dart";
+import "package:inventree/widget/location_list.dart";
 
 
 // Widget for performing database-wide search
diff --git a/lib/widget/stock_list.dart b/lib/widget/stock_list.dart
index 96040860..9364f23f 100644
--- a/lib/widget/stock_list.dart
+++ b/lib/widget/stock_list.dart
@@ -1,17 +1,14 @@
 
 import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
-import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
-import 'package:inventree/inventree/model.dart';
-import "package:inventree/inventree/sentry.dart";
+
+import "package:inventree/inventree/model.dart";
 import "package:inventree/inventree/stock.dart";
 import "package:inventree/widget/paginator.dart";
 import "package:inventree/widget/refreshable_state.dart";
-
 import "package:inventree/l10.dart";
 import "package:inventree/app_settings.dart";
 import "package:inventree/widget/stock_detail.dart";
-
 import "package:inventree/api.dart";
 
 class StockItemList extends StatefulWidget {