diff --git a/app/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java b/app/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
index 863a1a4ef..5a79fc282 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
@@ -229,7 +229,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
                  jvmArgs.add("-Xms128M");
                  jvmArgs.add("-Xmx1G");
                  */
-                Intent mainIntent = new Intent(mActivity, BaseMainActivity.class);
+                Intent mainIntent = new Intent(mActivity, MainActivity.class);
                 // mainIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
                 mainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
                 mainIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
diff --git a/app/src/main/res/layout/control_mapping.xml b/app/src/main/res/layout/control_mapping.xml
index af723eeec..5239def3e 100644
--- a/app/src/main/res/layout/control_mapping.xml
+++ b/app/src/main/res/layout/control_mapping.xml
@@ -17,12 +17,12 @@
 			android:layout_width="wrap_content"
 			android:layout_alignParentRight="true"/>
 
-		<net.kdt.pojavlaunch.customcontrols.ControlsLayout
+		<net.kdt.pojavlaunch.customcontrols.ControlLayout
 			android:id="@+id/customctrl_controllayout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-		</net.kdt.pojavlaunch.customcontrols.ControlsLayout>
+		</net.kdt.pojavlaunch.customcontrols.ControlLayout>
 
 	</RelativeLayout>