diff --git a/assets/icons/area.png b/assets/icons/area.png
new file mode 100644
index 0000000..0e4c1df
Binary files /dev/null and b/assets/icons/area.png differ
diff --git a/assets/icons/currency.png b/assets/icons/currency.png
new file mode 100644
index 0000000..79cae43
Binary files /dev/null and b/assets/icons/currency.png differ
diff --git a/assets/icons/digital_storage.png b/assets/icons/digital_storage.png
new file mode 100644
index 0000000..d7d58bd
Binary files /dev/null and b/assets/icons/digital_storage.png differ
diff --git a/assets/icons/length.png b/assets/icons/length.png
new file mode 100644
index 0000000..2fb55db
Binary files /dev/null and b/assets/icons/length.png differ
diff --git a/assets/icons/mass.png b/assets/icons/mass.png
new file mode 100644
index 0000000..5eb9bbe
Binary files /dev/null and b/assets/icons/mass.png differ
diff --git a/assets/icons/power.png b/assets/icons/power.png
new file mode 100644
index 0000000..2878320
Binary files /dev/null and b/assets/icons/power.png differ
diff --git a/assets/icons/time.png b/assets/icons/time.png
new file mode 100644
index 0000000..b015adb
Binary files /dev/null and b/assets/icons/time.png differ
diff --git a/assets/icons/volume.png b/assets/icons/volume.png
new file mode 100644
index 0000000..ee31bf1
Binary files /dev/null and b/assets/icons/volume.png differ
diff --git a/lib/screens/category_screen.dart b/lib/screens/category_screen.dart
index 1f168bb..6072346 100644
--- a/lib/screens/category_screen.dart
+++ b/lib/screens/category_screen.dart
@@ -9,7 +9,6 @@ class CategoryScreen extends StatefulWidget {
 }
 
 class _CategoryScreenState extends State<CategoryScreen> {
-
   List<Category> categories;
   static const _categoryNames = <String>[
     'Length',
@@ -44,15 +43,25 @@ class _CategoryScreenState extends State<CategoryScreen> {
     );
   }
 
-
-
-
-  ListView _buildCategoryWidgets(List<Category> categories) {
-    return ListView.builder(
-        itemCount: categories.length,
-        itemBuilder: (context, index) {
-          return categories[index];
-        });
+  Widget _buildCategoryWidgets(List<Category> categories) {
+    if (MediaQuery.of(context).orientation == Orientation.portrait) {
+      return ListView.builder(
+          itemCount: categories.length,
+          itemBuilder: (context, index) {
+            return categories[index];
+          });
+    } else {
+      return GridView.builder(
+          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+            crossAxisCount: 2,
+            mainAxisSpacing: 4,
+            crossAxisSpacing: 4,
+            childAspectRatio: 3
+          ),itemCount: categories.length,
+          itemBuilder: (context, index) {
+            return categories[index];
+          });
+    }
   }
 
   AppBar _buildAppBar() {
diff --git a/lib/screens/converter_screen.dart b/lib/screens/converter_screen.dart
index aa9d5d8..ba7c94f 100644
--- a/lib/screens/converter_screen.dart
+++ b/lib/screens/converter_screen.dart
@@ -33,13 +33,32 @@ class _ConverterScreenState extends State<ConverterScreen> {
       appBar: AppBar(
         title: Text(widget.name),
       ),
-      body: Column(
-
-        children: [
-          buildInput(),
-          buildArrows(),
-          buildOutput(),
-        ],
+      body: OrientationBuilder(
+        builder: (context,orientation){
+          if(orientation==Orientation.portrait){
+            return Column(
+              children: [
+                buildInput(),
+                buildArrows(),
+                buildOutput(),
+              ],
+            );
+          } else
+            {
+              return Center(
+                child: Container(
+                  width: 450,
+                  child: ListView(
+                    children: [
+                      buildInput(),
+                      buildArrows(),
+                      buildOutput(),
+                    ],
+                  ),
+                ),
+              );
+            }
+        },
       ),
     );
   }