diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
index 59e0f99..6e7abac 100644
--- a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
@@ -133,6 +133,8 @@ public class CourseServiceImpl implements CourseService {
 		System.out.println("***********************ここでエラー1");
 		if (userEntity.getCourseEntity().getCourseId() == courseId) {
 			return "selected";
+		} else if (courseId <= 6) {
+			return "original";
 		}
 		System.out.println("***********************ここでエラー2");
 		allocationRepository.deleteByCourseId(courseId);
diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java
index 7f047ba..257e6f4 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java
@@ -141,9 +141,13 @@ public class CourseController {
 
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 
+		} else if (condition.equals("original")) {
+			model.addAttribute("message", "既存のデータは削除できません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 		} else if (condition.equals("ok")) {
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
-		}
+		} 
 		model.addAttribute("message", "エラーが発生しました");
 
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
index 61133c1..fdbf9c4 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
@@ -275,7 +275,9 @@ public class GoalController {
 
 		int currentAmount = goalService.getCurrentAmount(userId);
 
-		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
+		System.out.println("************************currentAmount : " + currentAmount);
+		
+		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
@@ -292,7 +294,7 @@ public class GoalController {
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "現在所持金より高い金額を設定してください。");
 			return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 		}
-
+		
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 	}
 
diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
index d1e79fb..eb1ae23 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
@@ -429,7 +429,7 @@ public class TransactionController {
 
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
-		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
+		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
 				.collect(Collectors.toList());
 
 		if (!resultList.isEmpty()) {
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 8632b09..b7ebef2 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -214,6 +214,10 @@ td:hover {
     vertical-align: middle;
 }
 
+.goal {
+	min-width: 300px;
+}
+
 /* =======================
    ボタン
 ======================= */
diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html
index 0c478d1..8217b49 100644
--- a/src/main/resources/templates/fixed_cost_create.html
+++ b/src/main/resources/templates/fixed_cost_create.html
@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType">
+						<select class="form-select" id="transactionType" required>
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}">
+						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"
diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html
index 7acbe37..ebb9f05 100644
--- a/src/main/resources/templates/goal_create.html
+++ b/src/main/resources/templates/goal_create.html
@@ -37,7 +37,9 @@
 					<div>
 						<label>目標金額</label>
 						<input type="number" th:field="*{targetAmount}" required min="1">
-						<span th:text="|所持金：${currentAmount}円|"></span>
+						<br>
+						<span th:text="|所持金：${session.currentAmount}円|"></span>
+						<input type="hidden" name="currentAmount" th:value="${currentAmount}">
 						<span th:if="${message != null}">
 							<span th:text="${message}" style="color: red;"></span>
 						</span>
diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html
index 45b6b63..786d4ff 100644
--- a/src/main/resources/templates/goal_view.html
+++ b/src/main/resources/templates/goal_view.html
@@ -128,27 +128,32 @@
 
 								<tr>
 									<th>目標名</th>
-									<td th:text="${goalForm.goalTitle}"></td>
+									<td th:text="${goalForm.goalTitle}" 
+									    class="goal"></td>
 								</tr>
 
 								<tr>
-									<th>目標説明</th>
-									<td th:text="${goalForm.goalSubtitle}"></td>
+									<th>目標説明</th >
+									<td th:text="${goalForm.goalSubtitle}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標金額</th>
-									<td th:text="${goalForm.targetAmount}"></td>
+									<td th:text="${goalForm.targetAmount}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標達成期限</th>
-									<td th:text="${goalForm.deadline}"></td>
+									<td th:text="${goalForm.deadline}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>達成率</th>
-									<td th:text="${goalForm.achievementRate} + '%'"></td>
+									<td th:text="${goalForm.achievementRate} + '%'"
+									    class="goal"></td>
 								</tr>
 
 							</table>
diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index e2a5b43..912dfe8 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -21,12 +21,6 @@
 				</button>
 		    </form>
 	    </th:block>
-	
-	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-	<th:block th:if="${mode == 'change'}">
-		<form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
-		</form>
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
@@ -42,7 +36,8 @@
 						aria-controls="'collapse' + ${course.courseId}">
 						<span th:text="${course.courseName}"></span>
 					</button>
-					<p style="width: 120px;"><button type="button" class="btn btn-danger w-100"
+					
+					<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
 							th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
 				</h2>
 				<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html
index 0c818e9..c8295ed 100644
--- a/src/main/resources/templates/transaction_create.html
+++ b/src/main/resources/templates/transaction_create.html
@@ -122,6 +122,16 @@
 
 			const tType = '[[${session.tType}]]';
 			
+			console.log("tType: " + tType);
+			
+			if (tType.includes("0")) {
+				console.log("okokokokokokokkkokokokoko");
+				transactionType.value = "0";
+			} else if (tType.includes("1")) {
+				transactionType.value = "1";
+			}
+
+			
 			function toggleCategory() {
 
 			    if (transactionType.value === "0") {
@@ -164,12 +174,6 @@
 
 			});
 			
-			if (tType == "0") {
-				transactionType.value = "0";
-			} else if (tType == "1") {
-				transactionType.value = "1";
-			}
-			
 			toggleCategory();
 			
 		</script>