diff --git a/layouts/xedition/demo/welcome_main.html b/layouts/xedition/demo/welcome_main.html
index cf0a82e85..908a246f2 100644
--- a/layouts/xedition/demo/welcome_main.html
+++ b/layouts/xedition/demo/welcome_main.html
@@ -117,26 +117,26 @@
 		<span class="noti">CONNECT WITH US</span>
 		<h1 class="tit">GET INVOLVED</h1>
 		<ul>
-		<li>
-			<a href="https://www.xpressengine.com/" target="_blank" class="ico"><i class="xe-xpressengine"></i><span class="blind">PUBLIC HOME</span></a>
-			<h2>PUBLIC HOME</h2>
-			<p>XpressEngine의 공식<br /> 홈페이지입니다.</p>
-		</li>
-		<li>
-			<a href="https://github.com/xpressengine/xe-core/issues" target="_blank" class="ico"><i class="xe-github"></i><span class="blind">GITHUB</span></a>
-			<h2>GITHUB</h2>
-			<p>오픈소스 프로젝트 개발참여를<br /> 위한 GitHub 페이지입니다.</p>
-		</li>
-		<li>
-			<a href="https://www.facebook.com/xehub" target="_blank" class="ico"><i class="xe-facebook"></i><span class="blind">FACEBOOK</span></a>
-			<h2>FACEBOOK</h2>
-			<p>페이스북 페이지를 통해<br /> 다양한 소식을 접할 수 있습니다.</p>
-		</li>
-		<li>
-			<a href="https://www.xpressengine.com/forum" target="_blank" class="ico"><i class="xe-users"></i><span class="blind">OTHERS</span></a>
-			<h2>OTHERS</h2>
-			<p>XE와 관련한 다양한 커뮤니티를 만나보세요!</p>
-		</li>
+			<li>
+				<a href="https://www.xpressengine.com/forum" target="_blank" class="ico"><i class="xe-users"></i><span class="blind">COMMUNITY</span></a>
+				<h2>COMMUNITY</h2>
+				<p>XE와 관련한 다양한 커뮤니티를 만나보세요.</p>
+			</li>
+			<li>
+				<a href="https://www.xpressengine.com/qna" target="_blank" class="ico"><i class="xe-users"></i><span class="blind">Q&A</span></a>
+				<h2>Q&A</h2>
+				<p>도움이 필요할 때에는 전문가들과 이야기할 수 있습니다.</p>
+			</li>
+			<li>
+				<a href="https://www.xpressengine.com/download" target="_blank" class="ico"><i class="xe-download-square"></i><span class="blind">DOWNLOAD</span></a>
+				<h2>DOWNLOAD</h2>
+				<p>XE 자료실을 통해 나만의 홈페이지를 만들어보세요.</p>
+			</li>
+			<li>
+				<a href="https://github.com/xpressengine/xe-core/issues" target="_blank" class="ico"><i class="xe-github"></i><span class="blind">GITHUB</span></a>
+				<h2>GITHUB</h2>
+				<p>오픈소스 프로젝트 개발참여를 위한 GitHub 페이지입니다.</p>
+			</li>
 		</ul>
 	</section>
 </div>
diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
index 78c05bef5..f06510638 100644
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@@ -75,7 +75,7 @@
 				<li class="hover">
 					<!--@if($is_logged)-->
 						<!-- after_login -->
-						<a href="#" class="login_after">
+						<a href="{getUrl('act', 'dispMemberInfo')}" class="login_after">
 							<!--@if($logged_info->profile_image->src)-->
 								<img src="{$logged_info->profile_image->src}" alt="{$logged_info->nick_name}" />
 							<!--@else-->
@@ -92,7 +92,7 @@
 						<!-- /after_login -->
 					<!--@else-->
 						<!-- before_login -->
-						<a href="#"><i class="xe-user"></i><span class="blind">{$lang->cmd_login}/{$lang->cmd_signup}</span></a>
+						<a href="{getUrl('act', 'dispMemberLoginForm')}" id="ly_btn"><i class="xe-user"></i><span class="blind">{$lang->cmd_login}/{$lang->cmd_signup}</span></a>
 						<div class="ly ly_login">
 							<ul>
 								<li><a id="ly_login_btn" href="{getUrl('act', 'dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
@@ -325,7 +325,7 @@
 				keep_msg.hide();
 			}
 		});
-		$("#ly_login_btn").click(function () {
+		$("#ly_login_btn, #ly_btn").click(function () {
 			$(".login_widget").show();
 			return false;
 		});