diff --git a/premake5.lua b/premake5.lua
index ce40296..9f201db 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -6,9 +6,6 @@ project "bakara"
     targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
     objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
 
-    pchheader "bakarapch.h"
-    pchsource "bakarapch.cpp"
-
     files 
     {
         "%{wks.location}/vendor/glm/glm/**.hpp",
diff --git a/src/bakara/core/application.cpp b/src/bakara/core/application.cpp
index 05cd5db..a19278a 100644
--- a/src/bakara/core/application.cpp
+++ b/src/bakara/core/application.cpp
@@ -52,12 +52,12 @@ namespace Bk {
         {
             for (Layer* layer : p_layer_stack)
                 layer->on_update();
-
+            
             imgui_layer->begin();
             for (Layer* layer : p_layer_stack)
                 layer->imgui_render();
             imgui_layer->end();
-
+            
             h_window->on_update();
         }
     }
diff --git a/src/bakara/imgui/imgui_layer.cpp b/src/bakara/imgui/imgui_layer.cpp
index fd59e86..5b43df4 100644
--- a/src/bakara/imgui/imgui_layer.cpp
+++ b/src/bakara/imgui/imgui_layer.cpp
@@ -22,8 +22,10 @@ namespace Bk {
 
 		io.IniFilename = NULL;
 		io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;   
-		//io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;           // Enable Docking
+		io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;           // Enable Docking
 		io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
+		//io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
+		io.ConfigViewportsNoAutoMerge = true;
 		
 		// Setup Dear ImGui style
 		ImGui::StyleColorsDark();
@@ -42,7 +44,7 @@ namespace Bk {
 		
 		// Setup Platform/Renderer bindings
 		ImGui_ImplGlfw_InitForOpenGL(window, true);
-		ImGui_ImplOpenGL3_Init("#version 420");
+		ImGui_ImplOpenGL3_Init("#version 410");
 	}
 
 	void ImguiLayer::on_detach()