diff --git a/app/views/budget/_budget_headings.html.erb b/app/views/budget/_budget_headings.html.erb
index 37b0b33..de6866d 100644
--- a/app/views/budget/_budget_headings.html.erb
+++ b/app/views/budget/_budget_headings.html.erb
@@ -1,17 +1,18 @@
-
+
+
Fixed Expense
-
+
Investing
-
+
Savings
-
\ No newline at end of file
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
index be41643..cd6a37b 100644
--- a/app/views/dashboard/index.html.erb
+++ b/app/views/dashboard/index.html.erb
@@ -1,7 +1,7 @@
@@ -10,7 +10,7 @@
-
Budget
+ Final Budget
<%= turbo_frame_tag "salary_budget" do %>
@@ -32,13 +32,17 @@
<% end %>
- <%= turbo_frame_tag :incomes do %>
- <%= render "incomes/index" %>
- <% end %>
+
+ <%= turbo_frame_tag :incomes do %>
+ <%= render "incomes/index" %>
+ <% end %>
+
- <%= turbo_frame_tag "taxed_incomes" do %>
- <%= render partial: "shared/taxed_incomes", locals: { salary_taxed: @salary_taxed, hourly_taxed: @hourly_taxed} %>
- <% end %>
+
+ <%= turbo_frame_tag "taxed_incomes" do %>
+ <%= render partial: "shared/taxed_incomes", locals: { salary_taxed: @salary_taxed, hourly_taxed: @hourly_taxed} %>
+ <% end %>
+
@@ -60,12 +64,5 @@
<% end %>
-
-
-
- <%= render "federal_tax_brackets/index" %>
-
-
-
diff --git a/app/views/fixed_expenses/_fixed_expense.html.erb b/app/views/fixed_expenses/_fixed_expense.html.erb
index 40bfef9..7e59067 100644
--- a/app/views/fixed_expenses/_fixed_expense.html.erb
+++ b/app/views/fixed_expenses/_fixed_expense.html.erb
@@ -2,9 +2,9 @@
<% attributes = [fixed_expense.expense_name, humanized_money_with_symbol(fixed_expense.annual_cost), humanized_money_with_symbol(fixed_expense.monthly_cost), humanized_money_with_symbol(fixed_expense.bi_weekly_cost)] %>
<% attributes.each do |attribute| %>
-
<%= attribute %>
+
<%= attribute %>
<% end %>
-
<%= link_to "Edit", edit_fixed_expense_path(fixed_expense), class:"rounded-lg py-1 px-4 bg-gray-100 inline-block font-medium" %>
-
<%= button_to "Delete", fixed_expense_path(fixed_expense), method: :delete, class:"rounded-lg py-1 px-4 bg-gray-100 inline-block font-medium" %>
+
<%= link_to "Edit", edit_fixed_expense_path(fixed_expense), class:"rounded-lg px-2 bg-gray-100 inline-block font-medium" %>
+
<%= button_to "Delete", fixed_expense_path(fixed_expense), method: :delete, class:"rounded-lg px-2 bg-gray-100 inline-block font-medium" %>
<% end %>
diff --git a/app/views/fixed_expenses/_index.html.erb b/app/views/fixed_expenses/_index.html.erb
index 3ea8855..1eb4107 100644
--- a/app/views/fixed_expenses/_index.html.erb
+++ b/app/views/fixed_expenses/_index.html.erb
@@ -1,7 +1,7 @@
- <% fixed_headings = ["Expense Name", "Annual Cost", "Monthly Cost", "Bi-weekly Cost"] %>
+ <% fixed_headings = %w[Expense Annual Monthly Bi-weekly] %>
<% fixed_headings.each do |fixed_heading| %>
-
<%= fixed_heading %>
+
<%= fixed_heading %>
<% end %>
diff --git a/app/views/incomes/_income.html.erb b/app/views/incomes/_income.html.erb
index 4fb798e..d2e8745 100644
--- a/app/views/incomes/_income.html.erb
+++ b/app/views/incomes/_income.html.erb
@@ -2,8 +2,8 @@
<% attributes = [income.income_type, humanized_money_with_symbol(income.rate), income.hours, humanized_money_with_symbol(income.weekly_income)] %>
<% attributes.each do |attribute| %>
-
<%= attribute %>
+
<%= attribute %>
<% end %>
-
<%= link_to "Edit", edit_income_path(income), class:"rounded-lg py-1 px-4 bg-gray-100 inline-block font-medium" %>
+
<%= link_to "Edit", edit_income_path(income), class:"rounded-lg px-2 bg-gray-100 inline-block font-medium" %>
<% end %>
diff --git a/app/views/incomes/_index.html.erb b/app/views/incomes/_index.html.erb
index 78ff96c..8fb5a82 100644
--- a/app/views/incomes/_index.html.erb
+++ b/app/views/incomes/_index.html.erb
@@ -1,10 +1,9 @@
-<%= turbo_frame_tag :incomes do %>
-
- <% income_headings = ["Income Type", "Rate", "Hours", "Weekly Income"] %>
- <% income_headings.each do |income_heading| %>
-
<%= income_heading %>
- <% end %>
-
+
Net Income
+
+ <% income_headings = ["Income Type", "Rate", "Hours", "Weekly Gross"] %>
+ <% income_headings.each do |income_heading| %>
+
<%= income_heading %>
+ <% end %>
+
- <%= render @incomes %>
-<% end %>
+<%= render @incomes %>
diff --git a/app/views/shared/_taxed_incomes.html.erb b/app/views/shared/_taxed_incomes.html.erb
index c90f2e8..78a9e22 100644
--- a/app/views/shared/_taxed_incomes.html.erb
+++ b/app/views/shared/_taxed_incomes.html.erb
@@ -1,8 +1,8 @@
-
Income After Taxes
+
Gross Income
- <% fixed_headings = ["Income Type", "Federal Tax Paid", "State Tax Paid", "Annual Income", "Bi-weekly Income"] %>
+ <% fixed_headings = ["Income Type", "Federal Tax", "State Tax", "Annual", "Bi-weekly"] %>
<% fixed_headings.each do |fixed_heading| %>
-
<%= fixed_heading %>
+
<%= fixed_heading %>
<% end %>
diff --git a/spec/features/dashboard/dashboard_spec.rb b/spec/features/dashboard/dashboard_spec.rb
index b7257b0..6c1fdf1 100644
--- a/spec/features/dashboard/dashboard_spec.rb
+++ b/spec/features/dashboard/dashboard_spec.rb
@@ -11,7 +11,7 @@
describe "GET /index" do
it "routes to root path" do
visit root_path
- expect(page).to have_content "Dashboard"
+ expect(page).to have_content "Budget Calculator"
end
it "has incomes on dashboard" do