diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java b/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java
index d21a3870c..13395d769 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/screen/MatterPanelScreen.java
@@ -214,7 +214,7 @@ public class MatterPanelScreen extends MatteryScreen<MatterPanelMenu> {
 	}
 
 	private void openTask(MatterTask task) {
-		var task_frame = new FramePanel(this, null, 0, 0, MODAL_WIDTH, MODAL_HEIGHT, new TranslatableComponent("otm.container.matter_panel.task")) {
+		var task_frame = new FramePanel(this, null, 0, 0, 170, 40, new TranslatableComponent("otm.container.matter_panel.task")) {
 			@Override
 			public void tick() {
 				super.tick();
@@ -225,19 +225,7 @@ public class MatterPanelScreen extends MatteryScreen<MatterPanelMenu> {
 			}
 		};
 
-		var row_1 = new EditablePanel(this, task_frame);
-		var row_2 = new EditablePanel(this, task_frame);
-
-		row_1.setHeight(18);
-		row_2.setHeight(20);
-
-		row_1.setDocking(Dock.TOP);
-		row_2.setDocking(Dock.TOP);
-
-		row_1.setDockMargin(0, 2, 0, 0);
-		row_2.setDockMargin(0, 2, 0, 0);
-
-		var slot = new AbstractSlotPanel(this, row_1, 0, 0) {
+		var slot = new AbstractSlotPanel(this, task_frame, 0, 0) {
 			@Nonnull
 			@Override
 			protected ItemStack getItemStack() {
@@ -266,12 +254,12 @@ public class MatterPanelScreen extends MatteryScreen<MatterPanelMenu> {
 
 		slot.setDocking(Dock.LEFT);
 
-		var button = new ButtonPanel(this, row_2, 0, 0, 40, 20, new TranslatableComponent("otm.container.matter_panel.close"));
+		var button = new ButtonPanel(this, task_frame, 0, 0, 40, 20, new TranslatableComponent("otm.container.matter_panel.close"));
 		button.setDocking(Dock.RIGHT);
 		button.setDockMargin(2, 0, 0, 0);
 		button.bindOnPress(task_frame::remove);
 
-		button = new ButtonPanel(this, row_2, 0, 0, 80, 20, new TranslatableComponent("otm.container.matter_panel.cancel_task"));
+		button = new ButtonPanel(this, task_frame, 0, 0, 80, 20, new TranslatableComponent("otm.container.matter_panel.cancel_task"));
 		button.setDocking(Dock.RIGHT);
 		button.setDockMargin(2, 0, 0, 0);
 		button.bindOnPress(() -> {
@@ -284,7 +272,17 @@ public class MatterPanelScreen extends MatteryScreen<MatterPanelMenu> {
 	}
 
 	private void openPattern(PatternState state) {
-		var pattern_frame = new FramePanel(this, null, 0, 0, MODAL_WIDTH, MODAL_HEIGHT, new TranslatableComponent("otm.container.matter_panel.label"));
+		var pattern_frame = new FramePanel(this, null, 0, 0, MODAL_WIDTH, MODAL_HEIGHT, new TranslatableComponent("otm.container.matter_panel.label")){
+			@Override
+			public void tick() {
+				super.tick();
+
+				if (!menu.patterns.contains(state)) {
+					remove();
+				}
+			}
+		};
+
 		var row_1 = new EditablePanel(this, pattern_frame);
 		var row_2 = new EditablePanel(this, pattern_frame);
 		var row_3 = new EditablePanel(this, pattern_frame);
diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java
index aedf582b8..ba87a2827 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/ButtonPanel.java
@@ -12,7 +12,7 @@ public class ButtonPanel extends MinecraftWidgetPanel<Button> {
 
 	public ButtonPanel(@Nonnull MatteryScreen<?> screen, @Nullable EditablePanel parent, float x, float y, float width, float height, Component label) {
 		super(screen, parent, x, y, width, height, (panel) -> {
-			return new Button(0, 0, (int) panel.getWidth(), (int) panel.getHeight(), label, (btn) -> ((ButtonPanel) panel).onPress()) {
+			return new Button(0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), label, (btn) -> ((ButtonPanel) panel).onPress()) {
 				@Override
 				public boolean isHovered() {
 					return panel.is_hovered;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java
index 02e452218..066593add 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/EditBoxPanel.java
@@ -12,7 +12,7 @@ import javax.annotation.Nullable;
 public class EditBoxPanel extends MinecraftWidgetPanel<EditBox> {
 	public EditBoxPanel(@Nonnull MatteryScreen<?> screen, @Nullable EditablePanel parent, float x, float y, float width, float height, Component component) {
 		super(screen, parent, x, y, width, height, (panel) -> {
-			return new EditBox(screen.getFont(), 0, 0, (int) panel.getWidth(), (int) panel.getHeight(), component) {
+			return new EditBox(screen.getFont(), 0, 0, (int) panel.getWidth(), Math.min(20, (int) panel.getHeight()), component) {
 				@Override
 				public boolean isHovered() {
 					return panel.is_hovered;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java
index 0e22adac6..7269c04f8 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/screen/panels/FramePanel.java
@@ -74,8 +74,8 @@ public class FramePanel extends EditablePanel implements NarratableEntry {
 				}
 
 				RenderHelper.top_window_border.renderW(stack, 3, 0, width - 6);
-				RenderHelper.left_window_border.renderH(stack, 0, 3, height - 4);
-				RenderHelper.right_window_border.renderH(stack, width - RenderHelper.right_window_border.rect_w(), 3, height - 4);
+				RenderHelper.left_window_border.renderH(stack, 0, 3, height - (active ? (initial ? 2 : 4) : 3));
+				RenderHelper.right_window_border.renderH(stack, width - RenderHelper.right_window_border.rect_w(), 3, height - (active ? 4 : 3));
 
 				RenderHelper.top_left_window_corner.render(stack, 0, 0);
 				RenderHelper.top_right_window_corner.render(stack, width - RenderHelper.top_right_window_corner.rect_w(), 0);