diff --git a/Qwilight/Assets/UI/@Default/@Default.lua b/Qwilight/Assets/UI/@Default/@Default.lua
index 1c5a2b2..5b6cb10 100644
--- a/Qwilight/Assets/UI/@Default/@Default.lua
+++ b/Qwilight/Assets/UI/@Default/@Default.lua
@@ -188,10 +188,6 @@
 	return TotalNotesQuitPosition1(0) - 5
 end
 
-function PaintProperty23Position0(e)
-	return DefaultLength(1.0) - e
-end
-
 function PaintProperty0Variety()
 	if IsNoteFileModeBGA() then
 		return 2
diff --git a/Qwilight/Assets/UI/@Default/@Default.yaml b/Qwilight/Assets/UI/@Default/@Default.yaml
index c315e8a..1c43645 100644
--- a/Qwilight/Assets/UI/@Default/@Default.yaml
+++ b/Qwilight/Assets/UI/@Default/@Default.yaml
@@ -3,9 +3,9 @@
 format:
     zip: Default
     lua: Default
-    title: Qwilight basic skin.
+    title: Qwilight Default Skin
     title-1042: Qwilight 기본 스킨
-    comment: It's a basic skin made by a developer.
+    comment: The default skin created by the developer.
     comment-1042: 개발자가 만든 기본 스킨입니다.
     
     defaultLength: DefaultLength()
@@ -219,9 +219,6 @@
 
     # 선곡의 오토 플레이 텍스트
     paintProperty17: 12, InputNoteCountViewPosition1(-20), 207.5, 20, 1, 0, 1, 0, null, 0
-    
-    # 리절트의 트리거 백그라운드 이미지
-    paintProperty20: PaintProperty23Position0(591), AutoModeQuitPosition1(-5), 591, 34, 1, 0, 0, 0, null, 1
 
     # 선곡의 NPS 비주얼라이저 테두리
     paintProperty21: 12, InputNoteCountViewPosition1(0), CommentViewLength(-34), 68, 1, 0, 0, 0, null, 0
@@ -230,20 +227,19 @@
     paintProperty22: AutoModePosition0(-5), PaintProperty22Position1(), 34, 442, 1, 0, 0, 0, null, 0
     
     # 레벨 업
-    paintProperty23: PaintProperty23Position0(108), AutoModeQuitPosition1(0), 103, 24, 1, 0, 0, 0, null, 1
-    paintProperty24: PaintProperty23Position0(108), AutoModeQuitPosition1(0), 103, 24, 1, 0, 0, 100, null, 1
-
-    # 도전 과제 클리어
-    paintProperty25: PaintProperty23Position0(353), AutoModeQuitPosition1(0), 235, 24, 1, 0, 0, 0, null, 1
-    paintProperty26: PaintProperty23Position0(353), AutoModeQuitPosition1(0), 235, 24, 1, 0, 0, 101, null, 1
-
-    # 호칭 얻음
-    paintProperty27: PaintProperty23Position0(455), AutoModeQuitPosition1(0), 92, 24, 1, 0, 0, 0, null, 1
-    paintProperty28: PaintProperty23Position0(455), AutoModeQuitPosition1(0), 92, 24, 1, 0, 0, 106, null, 1
+    paintProperty23: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1
 
     # 레이팅 Point 얻음
-    paintProperty29: PaintProperty23Position0(586), AutoModeQuitPosition1(0), 121, 24, 1, 0, 0, 0, null, 1
-    paintProperty30: PaintProperty23Position0(586), AutoModeQuitPosition1(0), 121, 24, 1, 0, 0, 107, null, 1
+    paintProperty24: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1
+
+    # 호칭 얻음
+    paintProperty25: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1
+
+    # 도전 과제 클리어
+    paintProperty26: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1
+
+    # 티어 업
+    paintProperty27: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 0, 0, null, 1
 
     fadingProperty00: 50, 60, 0.5
     fadingProperty01: 100, 60, 0.25
diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip
index 787eac9..c69a250 100644
--- a/Qwilight/Assets/UI/@Default/@Default.zip
+++ b/Qwilight/Assets/UI/@Default/@Default.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b049e32294e7593f89099c24bfa235e3726eb20c167ebda5714b397261f4dc23
-size 465985440
+oid sha256:851088a5befed683f1dbe2e87f17d460739a2a42f7f1217f45eb3343f15b9404
+size 465304761
diff --git a/Qwilight/Note/BaseNote.cs b/Qwilight/Note/BaseNote.cs
index 70bbe96..ff79bb8 100644
--- a/Qwilight/Note/BaseNote.cs
+++ b/Qwilight/Note/BaseNote.cs
@@ -7,7 +7,7 @@
     public abstract class BaseNote : IComparable<BaseNote>
     {
         public const int LowestLayer = 0;
-        public const int HighestLayer = 4;
+        public const int HighestLayer = 6;
 
         int _levyingInput;
 
diff --git a/Qwilight/Note/CommentNote.cs b/Qwilight/Note/CommentNote.cs
index d4e0d42..b8ab8c8 100644
--- a/Qwilight/Note/CommentNote.cs
+++ b/Qwilight/Note/CommentNote.cs
@@ -16,6 +16,18 @@
         {
         }
 
+        public override void SetLayer(DefaultCompute defaultComputer)
+        {
+            if (defaultComputer.DrawingComponentValue.MainNoteLengthMap[TargetInput] > 0.0)
+            {
+                Layer = 6;
+            }
+            else
+            {
+                Layer = 5;
+            }
+        }
+
         public override void Paint(CanvasDrawingSession targetSession, bool isValidNetDrawings, DefaultCompute defaultComputer, ref Bound r)
         {
             if (Configure.Instance.UICommentNote)