diff --git a/TicTacToeApp.cpp b/TicTacToeApp.cpp
index e2e4005..545bea1 100644
--- a/TicTacToeApp.cpp
+++ b/TicTacToeApp.cpp
@@ -7,6 +7,7 @@ CTicTacToeApp app;
 BOOL CTicTacToeApp::InitInstance()
 {
 	CTicTacToeDlg* dlg = new CTicTacToeDlg();
+	m_pMainWnd = dlg;
 
 	dlg->DoModal();
 
diff --git a/TicTacToeDialog.vcxproj b/TicTacToeDialog.vcxproj
index 7836b1e..f3ad3f0 100644
--- a/TicTacToeDialog.vcxproj
+++ b/TicTacToeDialog.vcxproj
@@ -52,6 +52,7 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -136,7 +137,7 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/TicTacToeDlg.cpp b/TicTacToeDlg.cpp
index fe8842e..147c3ab 100644
--- a/TicTacToeDlg.cpp
+++ b/TicTacToeDlg.cpp
@@ -50,6 +50,9 @@ void CTicTacToeDlg::OnBnClickedSquare(UINT nID)
 		UINT comp_id = findComputerMove();
 		playerMove(comp_id);
 		buttons[comp_id].SetWindowTextW(L"O");
+		buttons[comp_id].SetFocus();
+		buttons[btn_id].SetButtonStyle(BS_FLAT);
+		buttons[comp_id].SetButtonStyle(BS_DEFPUSHBUTTON);
 		
 		if (checkWin(SqState::O)) {
 			ended = TRUE;
diff --git a/TicTacToeDlg.h b/TicTacToeDlg.h
index 82436e6..51c87af 100644
--- a/TicTacToeDlg.h
+++ b/TicTacToeDlg.h
@@ -7,7 +7,7 @@
 
 class CTicTacToeDlg : public CDialog, public TicTacToeGame {
 public:
-	CTicTacToeDlg() : CDialog(IDD_TIC_TAC_TOE_DIALOG, NULL) {};
+	CTicTacToeDlg() : CDialog(IDD_TIC_TAC_TOE_DIALOG) {};
 
 private:
 	void OnOK();