diff --git a/layouts/xedition/conf/info.xml b/layouts/xedition/conf/info.xml
index 02bf8b439..6ebf86f5d 100644
--- a/layouts/xedition/conf/info.xml
+++ b/layouts/xedition/conf/info.xml
@@ -3,22 +3,20 @@
 	<title xml:lang="ko">XEDITION</title>
 	<description xml:lang="ko">XE 1.8 기본 테마</description>
 	<version>1.8</version>
-	<date>2015-03-26</date>
+	<date>2015-04-07</date>
 	<author email_address="developer@xpressengine.com" link="https://www.xpressengine.com/">
 		<name xml:lang="ko">NAVER</name>
 	</author>
 	<menus>
 		<menu name="GNB" maxdepth="3" default="true">
-			<title xml:lang="ko">전역 네비게이션 바</title>
+			<title xml:lang="ko">메인 메뉴</title>
 		</menu>
-		<menu name="LNB" maxdepth="2">
-			<title xml:lang="ko">지역 네비게이션 바</title>
-		</menu>
-		<menu name="SNB" maxdepth="1">
-			<title xml:lang="ko">서브 네비게이션 바</title>
+		<menu name="UNB" maxdepth="1">
+			<title xml:lang="ko">매거진형 추가 메뉴</title>
+			<description xml:lang="ko">asdf</description>
 		</menu>
 		<menu name="FNB" maxdepth="2">
-			<title xml:lang="ko">푸터 네비게이션 바</title>
+			<title xml:lang="ko">푸터 메뉴</title>
 		</menu>
 	</menus>
 	<extra_vars>
@@ -48,31 +46,31 @@
 			<var name="menu_type_main" type="select">
 				<title xml:lang="ko">메인형 메뉴 타입</title>
 				<options value="basic">
-					<title xml:lang="ko">일반 메뉴  + 슬라이드 : 분리</title>
+					<title xml:lang="ko">기본형 : FIXED+SHRINKING</title>
 				</options>
 				<options value="startup">
-					<title xml:lang="ko">일반 메뉴 + 슬라이드 : 겹침</title>
+					<title xml:lang="ko">투명형 : TRANSPARENT HEADER</title>
 				</options>
 				<options value="magazine">
-					<title xml:lang="ko">매거진 메뉴 + 슬라이드 : 분리</title>
+					<title xml:lang="ko">매거진형 : HEADER WITH BOTTOM MENU</title>
 				</options>
 			</var>
 			<var name="menu_type_sub" type="select">
 				<title xml:lang="ko">서브형 메뉴 타입</title>
 				<options value="basic">
-					<title xml:lang="ko">일반 메뉴 + SIMPLE-TEXT HEADER</title>
+					<title xml:lang="ko">기본형 : SIMPLE-TEXT HEADER</title>
 				</options>
 				<options value="basic_regular">
-					<title xml:lang="ko">일반 메뉴 + REGULAR HEADER</title>
+					<title xml:lang="ko">기본형 : REGULAR HEADER</title>
 				</options>
 				<options value="onepage_parallax">
-					<title xml:lang="ko">겹침 메뉴 + REGULAR RARALLAX</title>
+					<title xml:lang="ko">투명형 : REGULAR RARALLAX</title>
 				</options>
 				<options value="magazine_simple">
-					<title xml:lang="ko">매거진 메뉴 + SIMPLE-TEXT HEADER</title>
+					<title xml:lang="ko">매거진형 : SIMPLE-TEXT HEADER</title>
 				</options>
 				<options value="magazine_regular">
-					<title xml:lang="ko">매거진 메뉴 + REGULAR HEADER</title>
+					<title xml:lang="ko">매거진형 : REGULAR HEADER</title>
 				</options>
 			</var>
 			<var name="content_fixed_width" type="select" default="index">
@@ -88,13 +86,13 @@
 				</options>
 			</var>
 			<var name="menu_fixed" type="select">
-				<description xml:lang="ko">매거진형 메뉴 타입 제외</description>
+				<description xml:lang="ko">매거진형 메뉴에는 적용되지 않습니다</description>
 				<title xml:lang="ko">메뉴 고정</title>
 				<options value="Y">
-					<title xml:lang="ko">상단 고정</title>
+					<title xml:lang="ko">상단에 고정</title>
 				</options>
 				<options value="N">
-					<title xml:lang="ko">고정안함</title>
+					<title xml:lang="ko">고정 안 함</title>
 				</options>
 			</var>
 			<var name="sidebar_position" type="select">
diff --git a/layouts/xedition/css/layout.css b/layouts/xedition/css/layout.css
index 518616605..1c300b3ba 100644
--- a/layouts/xedition/css/layout.css
+++ b/layouts/xedition/css/layout.css
@@ -38,8 +38,8 @@ a:hover,a:active,a:focus{text-decoration:none}
 
 /* Fixed Header */
 /*.container.fixed_header{padding-top:80px}*/
-
-.fixed_header .header_wrap.shrink{position:fixed;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards}
+.fixed_header .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
+.fixed_header .header_wrap.shrink{position:fixed;top:0;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards}
 .fixed_header .header_wrap.shrink .header>h1{padding:0}
 .fixed_header .header_wrap.shrink .gnb>ul>li>a{line-height:60px}
 .fixed_header .header_wrap.shrink .header>.side{margin:19px 0 0 22px}
@@ -83,10 +83,11 @@ a:hover,a:active,a:focus{text-decoration:none}
 
 /* Login */
 .header>.side>ul>li{float:left;position:relative}
+.header>.side>ul:after{display:block;clear:both;content:''}
 .header>.side>ul>li>a{display:block;width:22px;height:22px;margin-left:12px;font-size:22px;line-height:22px;color:#888;text-align:center}
 .header>.side>ul>li>a:hover,.header>.side>ul>li>a:focus,.header>.side>ul>li>a:active,.header>.side>ul>li.on>a{color:#444}
 .header>.side>ul .ly{position:relative;position:absolute;top:100%;right:0;margin-top:13px;background-color:#f9f9f9}
-.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:none;height:0}
+.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:url('../img/blank.gif') 0 0 repeat;height:0}
 .header>.side>ul .ly.ly_login ul{position:relative;margin-top:18px;padding:8px 0;background-color:#333;z-index:3}
 .header>.side>ul .on .ly.ly_login{height:auto}
 .header>.side>ul .ly a{display:block;min-width:120px;height:40px;padding:0 20px;line-height:40px;font-size:13px;color:#9d9d9d}
diff --git a/layouts/xedition/css/welcome.css b/layouts/xedition/css/welcome.css
index 51ba7b002..c622580aa 100644
--- a/layouts/xedition/css/welcome.css
+++ b/layouts/xedition/css/welcome.css
@@ -1,6 +1,7 @@
 @charset "utf-8";
 
 .welcomeXE{padding-top:50px;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif}
+.content + .welcomeXE { padding-top: 0;}
 .welcomeXE section{width:1200px;margin:0 auto}
 .welcomeXE .tit{padding-bottom:32px;font-size:40px;color:#333;font-weight:700;letter-spacing:1px;line-height:50px}
 .welcomeXE .noti{display:block;padding:28px 0 0;margin:0 0 12px;font-size:14px;font-weight:bold;color:#cda25a;letter-spacing:1px;line-height:20px}
diff --git a/layouts/xedition/js/layout.js b/layouts/xedition/js/layout.js
index 0c58a03be..e1f9510af 100644
--- a/layouts/xedition/js/layout.js
+++ b/layouts/xedition/js/layout.js
@@ -1,6 +1,7 @@
 (function($){
     "use strict";
     $(function(){
+        var $shrinkHeaderHeight = 300;
         var $fixedHeader = $('.fixed_header .header_wrap');
         var $gnb = $('.gnb');
         var $hoverEl = $('.hover');
@@ -15,17 +16,15 @@
             $(window).scroll(function() {
                 var scroll = $(this).scrollTop();
 
-                if(scroll >= fixedHeaderHeight ) {
+                if(scroll >= $shrinkHeaderHeight ) {
                     if(!hasClass)
                     {
-                        $('body').css('padding-top', fixedHeaderHeight);
                         $fixedHeader.addClass('shrink');
                         hasClass = true;
                     }
                 } else {
                     if(hasClass)
                     {
-                        $('body').css('padding-top', 0);
                         $fixedHeader.removeClass('shrink');
                         hasClass = false;
                     }
diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
index 87afbde51..5d4b5772e 100644
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@@ -9,10 +9,12 @@
 	{@ $_body_class = array()}
 	{@ $_container_class = array()}
 	{@ $_visual_class = array()}
+	{@ $_selected_menu = null}
+	{@ $sub_header_title = $module_info->browser_title}
 
 <!--// 초기화 -->
 	{@ $_enable_slide = true}
-	{@ $_enable_snb = false}
+	{@ $_enable_unb = false}
 	{@ $_sample_slide = false}
 	{@ $_sample_footer = false}
 	<block cond="!$layout_info->use_demo">{@ $layout_info->use_demo = 'Y'}</block>
@@ -31,26 +33,6 @@
 	<block cond="!$layout_info->slide_img1">{@ $_sample_slide = true}</block>
 	<block cond="$layout_info->use_demo === 'Y'">{@ $_sample_footer = true}</block>
 
-<!--// 레이아웃 타입 -->
-	<block cond="$layout_info->menu_fixed === 'Y'">{@ $_container_class[] = 'fixed_header'}</block>
-	<block cond="$layout_info->layout_type === 'auto'">
-		{@ $layout_info->layout_type = ($_is_indexmodule) ? 'main' : 'sub';}
-	</block>
-	{@ $_body_class[] = $layout_info->layout_type}
-	<block cond="!$_is_indexmodule">{@ $_body_class[] = $layout_info->sidebar_position}</block>
-
-	<block cond="$layout_info->layout_type === 'main'">
-		{@ $_visual_class[] = 'main'}
-		<block cond="$layout_info->menu_type_main === 'startup'">
-			{@ $_container_class[] = 'onepage'}
-		</block>
-		<block cond="$layout_info->menu_type_main === 'magazine'">
-			{@ $_container_class[] = 'magazine'}
-			{@ $_enable_snb = true}
-		</block>
-	</block>
-
-
 <!--// 콘텐츠 영역 폭 -->
 	<block cond="$layout_info->content_fixed_width === 'index'">
 		{@ $layout_info->content_fixed_width = (!$_is_indexmodule) ? 'Y' : 'N';}
@@ -58,7 +40,49 @@
 	<block cond="$layout_info->content_fixed_width === 'Y'">
 		{@ $_body_class[] = 'fixed-width'}
 	</block>
+	<!--// 회원, 커뮤니케이션 모듈 등 페이지에서 콘텐츠 영역 폭 고정 -->
+	{@ $_fixed_width_act = array(
+		'dispMemberSignUpForm',
+		'dispMemberLoginForm',
+		'dispMemberFindAccount',
+		'dispMemberInfo',
+		'dispMemberModifyPassword',
+		'dispMemberModifyEmailAddress',
+		'dispMemberModifyInfo',
+		'dispMemberLeave',
+		'dispMemberScrappedDocument',
+		'dispMemberSavedDocument',
+		'dispMemberOwnDocument',
+		'dispCommunicationFriend',
+		'dispCommunicationMessages',
+		'dispNcenterliteUserConfig',
+		'dispNcenterliteNotifyList',
+		'dispLoginxeclientListProvider',
+		'dispAjaxboardNotificationConfig'
+	)}
+	<block cond="in_array($act, $_fixed_width_act)">
+		{@ $_body_class[] = 'fixed-width'}
+		{@ $layout_info->sidebar_position = 'none'}
+		{@ $sub_header_title = 'Membership'}
+	</block>
 
+<!--// 레이아웃 타입 -->
+	<block cond="$layout_info->layout_type === 'auto'">
+		{@ $layout_info->layout_type = ($_is_indexmodule) ? 'main' : 'sub';}
+	</block>
+	{@ $_body_class[] = $layout_info->layout_type}
+	<block cond="!$_is_indexmodule">{@ $_body_class[] = $layout_info->sidebar_position}</block>
+	<block cond="$layout_info->layout_type === 'main'">
+		{@ $_visual_class[] = 'main'}
+		<block cond="$layout_info->menu_type_main === 'startup'">
+			{@ $_container_class[] = 'onepage'}
+		</block>
+		<block cond="$layout_info->menu_type_main === 'magazine'">
+			{@ $_container_class[] = 'magazine'}
+			{@ $_enable_unb = true}
+			{@ $layout_info->menu_fixed = 'N'}
+		</block>
+	</block>
 	<block cond="$layout_info->layout_type === 'sub'">
 		{@ $_enable_slide = false}
 		{@ $_visual_class[] = 'sub'}
@@ -67,7 +91,8 @@
 		</block>
 		<block cond="$layout_info->menu_type_sub === 'magazine_simple' || $layout_info->menu_type_sub === 'magazine_regular'">
 			{@ $_container_class[] = 'magazine'}
-			{@ $_enable_snb = true}
+			{@ $_enable_unb = true}
+			{@ $layout_info->menu_fixed = 'N'}
 		</block>
 		<block cond="$layout_info->menu_type_sub === 'onepage_parallax'">
 			{@ $_container_class[] = 'onepage'}
@@ -75,6 +100,14 @@
 		</block>
 	</block>
 
+<!--// 메뉴 -->
+	<block cond="$layout_info->menu_fixed === 'Y'">
+		{@ $_container_class[] = 'fixed_header'}
+	</block>
+
+
+
+
 <!--// Demo 기능 활성화 -->
 	<!--// 사이트 인덱스에서만 데모기능 사용 -->
 	<block cond="!$_is_indexmodule">{@ $layout_info->use_demo = 'N'}</block>
@@ -208,9 +241,9 @@
 			</div>
 
 			<!-- SNB -->
-			<div cond="$_enable_snb && $SNB->list" class="custom_area">
+			<div cond="$_enable_unb && $UNB->list" class="custom_area">
 				<ul>
-					<li loop="$SNB->list => $key, $val">
+					<li loop="$UNB->list => $key, $val">
 						<a href="{$val['href']}" target="_blank"|cond="$val['open_window'] == 'Y'">{$val['link']}</a>
 					</li>
 				</ul>
@@ -221,6 +254,7 @@
 				<ul>
 					<li loop="$GNB->list => $key1, $val1">
 						<a href="{$val1['href']}" target="_blank"|cond="$val1['open_window'] == 'Y'">{$val1['link']}</a>
+						<block cond="$val1['selected']">{@ $_selected_menu = $val1}</block>
 						<ul cond="$val1['list']" class="depth2">
 							<li loop="$val1['list'] => $key2, $val2" class="more"|cond="$val2['list']">
 								<a href="{$val2['href']}" target="_blank"|cond="$val2['open_window'] == 'Y'">{$val2['link']}</a>
@@ -244,7 +278,7 @@
 		<span class="bg_img" style="background-image:url({$layout_info->path}img/sub_banner_03.jpg)"></span>
 		<span cond="$layout_info->layout_type === 'sub'" class="mask"></span>
 		<div class="sub_title">
-			<h1>{$module_info->browser_title}</h1>
+			<h1>{$sub_header_title}</h1>
 		</div>
 	</div>
 
@@ -305,12 +339,12 @@
 	<!-- BODY -->
 	<div class="body {$_body_class}">
 		<!-- LNB -->
-		<nav cond="$LNB->list && $layout_info->layout_type === 'sub' && $layout_info->sidebar_position !== 'none'" class="lnb">
+		<nav cond="$_selected_menu['list'] && $layout_info->layout_type === 'sub' && $layout_info->sidebar_position !== 'none'" class="lnb">
 			<ul>
-				<li loop="$LNB->list => $key1, $val1">
+				<li loop="$_selected_menu['list'] => $key1, $val1">
 					<a href="{$val1['href']}" target="_blank"|cond="$val1['open_window'] == 'Y'">{$val1['link']}</a>
 					<ul cond="$val1['list']">
-						<li loop="$val1['list'] => $key2, $val2" class="on"|cond="$val1['selected']">
+						<li loop="$val1['list'] => $key2, $val2" class="on"|cond="$val2['selected']">
 							<a href="{$val2['href']}" target="_blank"|cond="$val2['open_window'] == 'Y'">{$val2['link']}</a>
 						</li>
 					</ul>
@@ -319,12 +353,12 @@
 		</nav>
 		<!-- /LNB -->
 		<!-- CONTENT -->
-			<!--@if($layout_info->use_demo === 'Y')-->
-				<include target="./demo/welcome_main.html" />
-			<!--@endif-->
 			<div class="content" id="content">
 				{$content}
 			</div>
+			<!--@if($layout_info->use_demo === 'Y')-->
+				<include target="./demo/welcome_main.html" />
+			<!--@endif-->
 		<!-- /CONTENT -->
 	</div>
 	<!-- END:BODY -->