diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java
index 4eb35203..ff0f675b 100644
--- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java
+++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java
@@ -30,13 +30,9 @@ import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.FCBaseMonitorContain;
-import com.glodblock.github.client.gui.container.FCBasePartContainer;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
 import com.glodblock.github.network.CPacketInventoryAction;
 import com.glodblock.github.util.Ae2ReflectClient;
 import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
@@ -80,11 +76,6 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
     private GuiImgButton terminalStyleBox;
     private GuiImgButton searchStringSave;
 
-    public GuiFCBaseMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te )
-    {
-        this( inventoryPlayer, te, new FCBasePartContainer( inventoryPlayer, te ) );
-    }
-
     public GuiFCBaseMonitor( final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCBaseMonitorContain c )
     {
 
@@ -144,8 +135,8 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
             final GuiImgButton iBtn = (GuiImgButton) btn;
             if( iBtn.getSetting() != Settings.ACTIONS )
             {
-                final Enum cv = iBtn.getCurrentValue();
-                final Enum next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
+                final Enum<?> cv = iBtn.getCurrentValue();
+                final Enum<?> next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
 
                 if( btn == this.terminalStyleBox )
                 {
@@ -188,6 +179,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void initGui()
     {
         Keyboard.enableRepeatEvents( true );
@@ -203,7 +195,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
         final int magicNumber = 114 + 1;
         final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
 
-        this.rows = (int) Math.floor( extraSpace / 18 );
+        this.rows = (int) Math.floor( extraSpace / 18.0 );
         if( this.rows > this.maxRows )
         {
             top += ( this.rows - this.maxRows ) * 18 / 2;
@@ -292,7 +284,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
         }
 
         // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH );
-        final Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
+        final Enum<?> setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
         this.searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting );
 
         if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui()))
@@ -354,7 +346,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
     @Override
     protected void mouseClicked( final int xCoord, final int yCoord, final int btn )
     {
-        final Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
+        final Enum<?> searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
 
         if( searchMode != SearchBoxMode.AUTOSEARCH && searchMode != SearchBoxMode.NEI_AUTOSEARCH )
         {
@@ -421,7 +413,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
                 return; // prevent weird double clicks..
             }
 
-            InventoryAction action = null;
+            InventoryAction action;
             if( isShiftKeyDown() )
             {
                 action = InventoryAction.CRAFT_SHIFT;
@@ -681,19 +673,19 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
     }
 
     @Override
-    public Enum getSortBy()
+    public Enum<?> getSortBy()
     {
         return this.configSrc.getSetting( Settings.SORT_BY );
     }
 
     @Override
-    public Enum getSortDir()
+    public Enum<?> getSortDir()
     {
         return this.configSrc.getSetting( Settings.SORT_DIRECTION );
     }
 
     @Override
-    public Enum getSortDisplay()
+    public Enum<?> getSortDisplay()
     {
         return this.configSrc.getSetting( Settings.VIEW_MODE );
     }
@@ -734,7 +726,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
         return this.customSortOrder;
     }
 
-    void setCustomSortOrder( final boolean customSortOrder )
+    public void setCustomSortOrder( final boolean customSortOrder )
     {
         this.customSortOrder = customSortOrder;
     }
@@ -744,7 +736,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
         return this.standardSize;
     }
 
-    void setStandardSize( final int standardSize )
+    public void setStandardSize( final int standardSize )
     {
         this.standardSize = standardSize;
     }
diff --git a/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java b/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java
index 3611feec..978f7c25 100644
--- a/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java
+++ b/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java
@@ -2,8 +2,10 @@ package com.glodblock.github.client.render;
 
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.RenderUtil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -22,12 +24,12 @@ public class ItemPacketRender implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-        return type == ItemRenderType.INVENTORY;
+        return type != ItemRenderType.FIRST_PERSON_MAP;
     }
 
     @Override
     public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
-        return false;
+        return type == ItemRenderType.ENTITY;
     }
 
     @Override
@@ -50,18 +52,11 @@ public class ItemPacketRender implements IItemRenderer {
             GL11.glColor3f((RGB >> 16 & 0xFF) / 255.0F, (RGB >> 8 & 0xFF) / 255.0F, (RGB & 0xFF) / 255.0F);
         }
 
-        Tessellator tess = Tessellator.instance;
-        tess.startDrawingQuads();
-        // draw a simple rectangle for the inventory icon
-        final float x_min = icon.getMinU();
-        final float x_max = icon.getMaxU();
-        final float y_min = icon.getMinV();
-        final float y_max = icon.getMaxV();
-        tess.addVertexWithUV( 0, 16, 0, x_min, y_max);
-        tess.addVertexWithUV(16, 16, 0, x_max, y_max);
-        tess.addVertexWithUV(16,  0, 0, x_max, y_min);
-        tess.addVertexWithUV( 0,  0, 0, x_min, y_min);
-        tess.draw();
+        if (type.equals(ItemRenderType.INVENTORY)) {
+            RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+        } else {
+            ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
+        }
 
         GL11.glDisable(GL11.GL_BLEND);
         GL11.glDisable(GL11.GL_ALPHA_TEST);
diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/block/BlockFluidDiscretizer.java
index e379c2e2..333979be 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockFluidDiscretizer.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockFluidDiscretizer.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidDiscretizer;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -19,6 +20,7 @@ public class BlockFluidDiscretizer extends FCBaseBlock {
     public BlockFluidDiscretizer register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_FLUID_DISCRETIZER);
         GameRegistry.registerTileEntity(TileFluidDiscretizer.class, NameConst.BLOCK_FLUID_DISCRETIZER);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java b/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java
index 608caa7c..ebaa363f 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java
@@ -7,6 +7,7 @@ import appeng.core.sync.GuiBridge;
 import appeng.tile.misc.TileInterface;
 import appeng.util.Platform;
 import com.glodblock.github.client.render.RenderBlockFluidInterface;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidInterface;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
@@ -78,6 +79,7 @@ public class BlockFluidInterface extends FCBaseBlock {
     public BlockFluidInterface register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_FLUID_INTERFACE);
         GameRegistry.registerTileEntity(TileFluidInterface.class, NameConst.BLOCK_FLUID_INTERFACE);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidPacketDecoder.java b/src/main/java/com/glodblock/github/common/block/BlockFluidPacketDecoder.java
index 1da67ea1..e0be3d6a 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockFluidPacketDecoder.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockFluidPacketDecoder.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidPacketDecoder;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
@@ -40,6 +41,7 @@ public class BlockFluidPacketDecoder extends FCBaseBlock {
     public BlockFluidPacketDecoder register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_FLUID_PACKET_DECODER);
         GameRegistry.registerTileEntity(TileFluidPacketDecoder.class, NameConst.BLOCK_FLUID_PACKET_DECODER);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidPatternEncoder.java b/src/main/java/com/glodblock/github/common/block/BlockFluidPatternEncoder.java
index fc1449b6..524e3a0b 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockFluidPatternEncoder.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockFluidPatternEncoder.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidPatternEncoder;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
@@ -40,6 +41,7 @@ public class BlockFluidPatternEncoder extends FCBaseBlock {
     public BlockFluidPatternEncoder register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_FLUID_PATTERN_ENCODER);
         GameRegistry.registerTileEntity(TileFluidPatternEncoder.class, NameConst.BLOCK_FLUID_PATTERN_ENCODER);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockIngredientBuffer.java b/src/main/java/com/glodblock/github/common/block/BlockIngredientBuffer.java
index d1308fd4..ebe2b6d2 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockIngredientBuffer.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockIngredientBuffer.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileIngredientBuffer;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
@@ -41,6 +42,7 @@ public class BlockIngredientBuffer extends FCBaseBlock {
     public BlockIngredientBuffer register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_INGREDIENT_BUFFER);
         GameRegistry.registerTileEntity(TileIngredientBuffer.class, NameConst.BLOCK_INGREDIENT_BUFFER);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockLargeIngredientBuffer.java b/src/main/java/com/glodblock/github/common/block/BlockLargeIngredientBuffer.java
index ff5f5671..ffe9210a 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockLargeIngredientBuffer.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockLargeIngredientBuffer.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileLargeIngredientBuffer;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
@@ -41,6 +42,7 @@ public class BlockLargeIngredientBuffer extends FCBaseBlock {
     public BlockLargeIngredientBuffer register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_LARGE_INGREDIENT_BUFFER);
         GameRegistry.registerTileEntity(TileLargeIngredientBuffer.class, NameConst.BLOCK_LARGE_INGREDIENT_BUFFER);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java b/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java
index 0a6c26ce..c0bcdc8d 100644
--- a/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java
+++ b/src/main/java/com/glodblock/github/common/block/BlockOCPatternEditor.java
@@ -1,6 +1,7 @@
 package com.glodblock.github.common.block;
 
 import appeng.block.AEBaseItemBlock;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileOCPatternEditor;
 import com.glodblock.github.crossmod.opencomputers.OCDriverInit;
 import com.glodblock.github.inventory.InventoryHandler;
@@ -44,6 +45,7 @@ public class BlockOCPatternEditor extends FCBaseBlock {
             GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_OC_PATTERN_EDITOR);
             GameRegistry.registerTileEntity(TileOCPatternEditor.class, NameConst.BLOCK_OC_PATTERN_EDITOR);
             OCDriverInit.run();
+            setCreativeTab(FluidCraftingTabs.INSTANCE);
             return this;
         }
         return null;
diff --git a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java
index 02dec4b8..2ba2bc2b 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java
@@ -23,6 +23,7 @@ import com.glodblock.github.common.storage.CellType;
 import com.glodblock.github.common.storage.IFluidCellInventory;
 import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
 import com.glodblock.github.common.storage.IStorageFluidCell;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.NameConst;
 import com.google.common.base.Optional;
@@ -329,6 +330,7 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
     public ItemBasicFluidStorageCell register() {
         if (!Config.fluidCells) return null;
         GameRegistry.registerItem(this, NameConst.ITEM_FLUID_STORAGE + this.totalBytes / 1024 , FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java
index dd5b43bf..6b713d97 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java
@@ -2,6 +2,7 @@ package com.glodblock.github.common.item;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.Config;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -59,6 +60,7 @@ public class ItemBasicFluidStoragePart extends Item {
     public ItemBasicFluidStoragePart register() {
         if (!Config.fluidCells) return null;
         GameRegistry.registerItem(this, NameConst.ITEM_FLUID_PART, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java b/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
index 61323650..0b96820c 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
@@ -5,6 +5,7 @@ import appeng.api.parts.IPartItem;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.parts.PartFluidExportBus;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -39,6 +40,7 @@ public class ItemFluidExportBus extends Item implements IPartItem {
     public ItemFluidExportBus register() {
         if (!Config.fluidIOBus) return null;
         GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_EXPORT, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java b/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
index 5f5c900b..77a69b75 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
@@ -5,6 +5,7 @@ import appeng.api.parts.IPartItem;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.parts.PartFluidImportBus;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -39,6 +40,7 @@ public class ItemFluidImportBus extends Item implements IPartItem {
     public ItemFluidImportBus register() {
         if (!Config.fluidIOBus) return null;
         GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_IMPORT, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
index aecbb33f..cb837030 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
@@ -4,6 +4,7 @@ import appeng.api.AEApi;
 import appeng.api.parts.IPartItem;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.parts.PartFluidInterface;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -37,6 +38,7 @@ public class ItemPartFluidInterface extends Item implements IPartItem {
 
     public ItemPartFluidInterface register() {
         GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_INTERFACE, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
index caf37862..3b2e3a5f 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
@@ -4,6 +4,7 @@ import appeng.api.AEApi;
 import appeng.api.parts.IPartItem;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.parts.PartFluidPatternTerminal;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -37,6 +38,7 @@ public class ItemPartFluidPatternTerminal extends Item implements IPartItem {
 
     public ItemPartFluidPatternTerminal register() {
         GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
index f19dcb96..7260744d 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
@@ -4,6 +4,7 @@ import appeng.api.AEApi;
 import appeng.api.parts.IPartItem;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -37,6 +38,7 @@ public class ItemPartFluidPatternTerminalEx extends Item implements IPartItem {
 
     public ItemPartFluidPatternTerminalEx register() {
         GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL_EX, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
diff --git a/src/main/java/com/glodblock/github/common/tabs/FluidCraftingTabs.java b/src/main/java/com/glodblock/github/common/tabs/FluidCraftingTabs.java
new file mode 100644
index 00000000..9cdf03b2
--- /dev/null
+++ b/src/main/java/com/glodblock/github/common/tabs/FluidCraftingTabs.java
@@ -0,0 +1,20 @@
+package com.glodblock.github.common.tabs;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class FluidCraftingTabs extends CreativeTabs {
+
+    public static final FluidCraftingTabs INSTANCE = new FluidCraftingTabs(FluidCraft.MODID);
+
+    public FluidCraftingTabs(String name){
+        super(name);
+    }
+
+    @Override
+    public Item getTabIconItem() {
+        return ItemAndBlockHolder.DISCRETIZER.stack().getItem();
+    }
+}
diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java
index 2a46dd67..dbf9b94d 100644
--- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java
+++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java
@@ -7,6 +7,14 @@ import com.glodblock.github.common.storage.CellType;
 
 public class ItemAndBlockHolder {
 
+    public static BlockFluidDiscretizer DISCRETIZER = new BlockFluidDiscretizer().register();
+    public static BlockFluidPatternEncoder ENCODER = new BlockFluidPatternEncoder().register();
+    public static BlockFluidPacketDecoder DECODER = new BlockFluidPacketDecoder().register();
+    public static BlockFluidInterface INTERFACE = new BlockFluidInterface().register();
+    public static BlockIngredientBuffer BUFFER = new BlockIngredientBuffer().register();
+    public static BlockLargeIngredientBuffer LARGE_BUFFER = new BlockLargeIngredientBuffer().register();
+    public static BlockOCPatternEditor OC_EDITOR = new BlockOCPatternEditor().register();
+
     public static ItemFluidDrop DROP = new ItemFluidDrop().register();
     public static ItemFluidEncodedPattern PATTERN = new ItemFluidEncodedPattern().register();
     public static ItemPartFluidPatternTerminal FLUID_TERMINAL = new ItemPartFluidPatternTerminal().register();
@@ -24,14 +32,6 @@ public class ItemAndBlockHolder {
     public static ItemBasicFluidStorageCell CELL4096K = new ItemBasicFluidStorageCell(CellType.Cell4096kPart, 4096).register();
     public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register();
 
-    public static BlockFluidDiscretizer DISCRETIZER = new BlockFluidDiscretizer().register();
-    public static BlockFluidPatternEncoder ENCODER = new BlockFluidPatternEncoder().register();
-    public static BlockFluidPacketDecoder DECODER = new BlockFluidPacketDecoder().register();
-    public static BlockFluidInterface INTERFACE = new BlockFluidInterface().register();
-    public static BlockIngredientBuffer BUFFER = new BlockIngredientBuffer().register();
-    public static BlockLargeIngredientBuffer LARGE_BUFFER = new BlockLargeIngredientBuffer().register();
-    public static BlockOCPatternEditor OC_EDITOR = new BlockOCPatternEditor().register();
-
     public static void loadSetting() {
         if (!Config.fluidCells) return;
         CellType.Cell1kPart.setItemInstance(CELL_PART);
diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang
index 3c262bc0..edae99ab 100644
--- a/src/main/resources/assets/ae2fc/lang/en_US.lang
+++ b/src/main/resources/assets/ae2fc/lang/en_US.lang
@@ -50,3 +50,5 @@ ae2fc.gui.fluid_interface.3=S
 ae2fc.gui.fluid_interface.4=W
 ae2fc.gui.fluid_interface.5=E
 ae2fc.gui.oc_pattern_editor=OC Pattern Editor
+
+itemGroup.ae2fc=Fluid Craft For AE2