diff --git a/Gemfile b/Gemfile
index 587ab06..c0db420 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
+# rubocop:disable Style/FrozenStringLiteralComment
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
@@ -43,9 +44,9 @@ group :development do
   gem 'listen', '~> 3.2'
   gem 'web-console', '>= 3.3.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'bullet'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem "bullet"
 end
 
 group :test do
@@ -58,3 +59,5 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
+
+# rubocop: enable Style/FrozenStringLiteralComment
diff --git a/app/.rubocop.yml b/app/.rubocop.yml
new file mode 100644
index 0000000..dc0b5a4
--- /dev/null
+++ b/app/.rubocop.yml
@@ -0,0 +1,63 @@
+AllCops:
+  Exclude:
+    - "db/**/*"
+    - "bin/*" 
+    - "test/*"
+    - "config/**/*"
+    - "Guardfile"
+    - "Rakefile"
+    - "README.md"
+    - "node_modules/**/*"
+
+  DisplayCopNames: true
+
+Layout/LineLength:
+  Max: 120
+Metrics/MethodLength:
+  Include:
+    - "app/controllers/*"
+    - "app/models/*"
+  Max: 20
+Metrics/AbcSize:
+  Include:
+    - "app/controllers/*"
+    - "app/models/*"
+  Max: 50
+Metrics/ClassLength:
+  Max: 150
+Metrics/BlockLength:
+  ExcludedMethods: ['describe']
+  Max: 30
+
+Style/Documentation:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/EachForSimpleLoop:
+  Enabled: false
+Style/AndOr:
+  Enabled: false
+Style/DefWithParentheses:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never
+Style/HashEachMethods:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
+
+
+Layout/HashAlignment:
+  EnforcedColonStyle: key
+Layout/ExtraSpacing:
+  AllowForAlignment: false
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Lint/RaiseException:
+  Enabled: false
+Lint/StructNewOverride:
+  Enabled: false
\ No newline at end of file
diff --git a/app/.stickler.yml b/app/.stickler.yml
new file mode 100644
index 0000000..37e97a4
--- /dev/null
+++ b/app/.stickler.yml
@@ -0,0 +1,23 @@
+# add the linters you want stickler to use for this project
+linters:
+  rubocop:
+    display_cop_names: true
+    # indicate where is the config file for stylelint
+    config: './rubocop.yml'
+
+# add the files here you want to be ignored by stylelint
+files:
+  ignore:
+    - "bin/*"
+    - "test/*"
+    - "db/*"
+    - "config/*"
+    - "Guardfile"
+    - "Rakefile"
+    - "README.md"
+    - "node_modules/**/*"
+
+# PLEASE DO NOT enable auto fixing options
+# if you need extra support from you linter - do it in your local env as described in README for this config
+
+# find full documentation here: https://stickler-ci.com/docs
\ No newline at end of file
diff --git a/app/views/groups/_form.html.erb b/app/views/groups/_form.html.erb
index 8240a20..49f5f36 100644
--- a/app/views/groups/_form.html.erb
+++ b/app/views/groups/_form.html.erb
@@ -1,22 +1,18 @@
 <%= form_for @group do |f| %>
-
-   <% if @group.errors.any? %>
-   <ul>
-   <% @group.errors.full_messages.each do |msg| %>
-       <li class="error"><%= msg %></li>
-   <% end %>
+  <% if @group.errors.any? %>
+    <ul>
+      <% @group.errors.full_messages.each do |msg| %>
+        <li class="error"><%= msg %></li>
+      <% end %>
     </ul>
-   <% end %>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %><br />
-
-    <p class = "icons_grp">
+  <% end %>
+  <%= f.label :name %><br />
+  <%= f.text_field :name %><br />
+  <p class = "icons_grp">
     <b >Icon</b><br />
     <%= f.radio_button :icon, 'fa fa-bus' %><i class="fa fa-bus" aria-hidden="true"></i><br />
     <%= f.radio_button :icon, 'fa fa-briefcase' %> <i class="fa fa-briefcase" aria-hidden="true"></i><br />
     <%= f.radio_button :icon, 'fa fa-calculator' %> <i class="fa fa-calculator" aria-hidden="true"></i><br />
-   </p>
-
-
-    <%= f.submit class: "submit text-center btn btn-primary" %>
-<% end %>
\ No newline at end of file
+  </p>
+  <%= f.submit class: "submit text-center btn btn-primary" %>
+<% end %>
diff --git a/app/views/groups/edit.html.erb b/app/views/groups/edit.html.erb
index 9507613..4fb7225 100644
--- a/app/views/groups/edit.html.erb
+++ b/app/views/groups/edit.html.erb
@@ -1,4 +1,4 @@
 <div class="form_app container">
-<h2>edit group</h2>
-<%= render 'form', group: @group %>
-</div>
\ No newline at end of file
+  <h2>edit group</h2>
+  <%= render 'form', group: @group %>
+</div>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index c518783..026e55b 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -1,61 +1,41 @@
 <section class="transaction_header">
-<div class="container t-d">
-<div class="button">
-
-<%= link_to root_path do %>
- <i class="fa fa-bars" aria-hidden="true"></i>
-<% end %>
-
-</div>
-<div class="title">
-Groups
-</div>
-
-<div class="search">
-<i class="fa fa-search" aria-hidden="true"></i>
-</div>
-</div>
-
-<h3 class ="text-center">most recent</h3>
-
-</section>
-<section class="transaction_body">  
-
-<div class="container t-c">
-
-<% @groups.each do |g| %>
- <a href= "groups/<%=g.id%>" >
-<div class="card mb-3">
-
-  <div class="row no-gutters">
-    <div class="col-md-4 grp-icn">
-      <i class= "<%= g.icon %>" ></i>
+  <div class="container t-d">
+    <div class="button">
+      <%= link_to root_path do %>
+        <i class="fa fa-bars" aria-hidden="true"></i>
+      <% end %>
+    </div>
+    <div class="title">
+      Groups
     </div>
-    <div class="col-md-8">
-      <div class="card-body">
-        <h5 class="card-title"> <%= g.name %> </h5>
-        
-        <p class="card-text"><small class="text-muted"><%= g.created_at %></small></p>
-        <%=  edit_delete_btn(current_user, g) %>
-      
-      
-        
-       
-      </div>
+    <div class="search">
+      <i class="fa fa-search" aria-hidden="true"></i>
     </div>
   </div>
-</div>
-</a>
-<% end %>
-</div>
-
-<br>
-
-
-<br>
-<%= link_to "Add new", new_group_path , :class => "btn btn-success  new_trans" %>
+  <h3 class ="text-center">most recent</h3>
+</section>
+<section class="transaction_body">
+  <div class="container t-c">
+    <% @groups.each do |g| %>
+      <a href= "groups/<%=g.id%>" >
+        <div class="card mb-3">
+          <div class="row no-gutters">
+            <div class="col-md-4 grp-icn">
+              <i class= "<%= g.icon %>" ></i>
+            </div>
+            <div class="col-md-8">
+              <div class="card-body">
+                <h5 class="card-title"> <%= g.name %> </h5>
+                <p class="card-text"><small class="text-muted"><%= g.created_at %></small></p>
+                <%=  edit_delete_btn(current_user, g) %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a>
+    <% end %>
+  </div>
+  <br>
+  <br>
+  <%= link_to "Add new", new_group_path , :class => "btn btn-success  new_trans" %>
 </section>
-
-
-
-
diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
index 0a6085c..2b0c111 100644
--- a/app/views/groups/new.html.erb
+++ b/app/views/groups/new.html.erb
@@ -1,4 +1,4 @@
 <div class="form_app container">
-<h2>new group</h2>
-<%= render 'form', group: @group %>
-</div>
\ No newline at end of file
+  <h2>new group</h2>
+  <%= render 'form', group: @group %>
+</div>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
index 6eb21df..d311735 100644
--- a/app/views/groups/show.html.erb
+++ b/app/views/groups/show.html.erb
@@ -1,64 +1,48 @@
 <section class="transaction_header">
-<div class="container t-d">
-<div class="button">
-<%= link_to root_path do %>
- <i class="fa fa-bars" aria-hidden="true"></i>
-<% end %>
-</div>
-<div class="title">
-Transactions for a specific group
-</div>
-
-<div class="search">
-<i class="fa fa-search" aria-hidden="true"></i>
-</div>
-</div>
-
-<h3 class ="text-center">most recent</h3>
-
+  <div class="container t-d">
+    <div class="button">
+      <%= link_to root_path do %>
+        <i class="fa fa-bars" aria-hidden="true"></i>
+      <% end %>
+    </div>
+    <div class="title">
+      Transactions for a specific group
+    </div>
+    <div class="search">
+      <i class="fa fa-search" aria-hidden="true"></i>
+    </div>
+  </div>
+  <h3 class ="text-center">most recent</h3>
 </section>
-
-<section class="transaction_body">  
-<div class="total_amount_sec">
-<div class="amount_title">
- total amount
-</div>
-
-<div class="actual_total_amount">
-  $ <%= @total %>
-</div>
-</div>
-<div class="container t-c">
-
-<% @transaction.each do |t| %>
- 
-<div class="card mb-3">
-  <div class="row no-gutters">
-    <div class="col-md-4 grp-icn">
-     <i class= "<%= t.group.icon %>" ></i>
-     
+<section class="transaction_body">
+  <div class="total_amount_sec">
+    <div class="amount_title">
+      total amount
     </div>
-    <div class="col-md-8">
-      <div class="card-body">
-        <h5 class="card-title  trns"> <%= t.name %> </h5>
-        <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
-        <p class="card-text"> <span>created by</span> <%= t.user.name %></p>
-        <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
-        
-      </div>
+    <div class="actual_total_amount">
+      $ <%= @total %>
     </div>
   </div>
-</div>
-<% end %>
-</div>
-
-<br>
-
-
-<br>
-<%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
+  <div class="container t-c">
+    <% @transaction.each do |t| %>
+      <div class="card mb-3">
+        <div class="row no-gutters">
+          <div class="col-md-4 grp-icn">
+            <i class= "<%= t.group.icon %>" ></i>
+          </div>
+          <div class="col-md-8">
+            <div class="card-body">
+              <h5 class="card-title  trns"> <%= t.name %> </h5>
+              <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
+              <p class="card-text"> <span>created by</span> <%= t.user.name %></p>
+              <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <br>
+  <br>
+  <%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
 </section>
-
-
-
-
diff --git a/app/views/static_pages/external.html.erb b/app/views/static_pages/external.html.erb
index 7e996e6..b1b5717 100644
--- a/app/views/static_pages/external.html.erb
+++ b/app/views/static_pages/external.html.erb
@@ -1,67 +1,49 @@
 <section class="transaction_header">
-<div class="container t-d">
-<div class="button">
-<%= link_to root_path do %>
- <i class="fa fa-bars" aria-hidden="true"></i>
-<% end %>
-</div>
-<div class="title">
-Extra transactions
-</div>
-
-<div class="search">
-<i class="fa fa-search" aria-hidden="true"></i>
-</div>
-</div>
-
-<h3 class ="text-center">most recent</h3>
-
+  <div class="container t-d">
+    <div class="button">
+      <%= link_to root_path do %>
+        <i class="fa fa-bars" aria-hidden="true"></i>
+      <% end %>
+    </div>
+    <div class="title">
+      Extra transactions
+    </div>
+    <div class="search">
+      <i class="fa fa-search" aria-hidden="true"></i>
+    </div>
+  </div>
+  <h3 class ="text-center">most recent</h3>
 </section>
-
-<section class="transaction_body">  
-<div class="total_amount_sec">
-<div class="amount_title">
- total amount
-</div>
-
-<div class="actual_total_amount">
-  $ <%= @external_total %>
-</div>
-</div>
-<div class="container t-c">
-
-<% @external_user_transactions.each do |t| %>
- 
-<div class="card mb-3">
-  <div class="row no-gutters">
-    <div class="col-md-4 grp-icn">
-  
-      <i class="fa fa-file-o" aria-hidden="true"></i>
-     
+<section class="transaction_body">
+  <div class="total_amount_sec">
+    <div class="amount_title">
+      total amount
     </div>
-    <div class="col-md-8">
-      <div class="card-body">
-        <h5 class="card-title trns"> <%= t.name %> </h5>
-        <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
-        <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
-        
-        <%= link_to "edit", edit_transaction_path(t), :class => "btn btn-primary edit_btn" %>
-        
-        <%= link_to "delete", transaction_path(t), :class => "btn btn-danger delete_grp_btn", data: {confirm: "Are you sure?"}, :method => :delete %> 
-      </div>
+    <div class="actual_total_amount">
+      $ <%= @external_total %>
     </div>
   </div>
-</div>
-<% end %>
-</div>
-
-<br>
-
-
-<br>
-<%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
+  <div class="container t-c">
+    <% @external_user_transactions.each do |t| %>
+      <div class="card mb-3">
+        <div class="row no-gutters">
+          <div class="col-md-4 grp-icn">
+            <i class="fa fa-file-o" aria-hidden="true"></i>
+          </div>
+          <div class="col-md-8">
+            <div class="card-body">
+              <h5 class="card-title trns"> <%= t.name %> </h5>
+              <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
+              <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
+              <%= link_to "edit", edit_transaction_path(t), :class => "btn btn-primary edit_btn" %>
+              <%= link_to "delete", transaction_path(t), :class => "btn btn-danger delete_grp_btn", data: {confirm: "Are you sure?"}, :method => :delete %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <br>
+  <br>
+  <%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
 </section>
-
-
-
-
diff --git a/app/views/static_pages/friends.html.erb b/app/views/static_pages/friends.html.erb
index 5816619..bb0b637 100644
--- a/app/views/static_pages/friends.html.erb
+++ b/app/views/static_pages/friends.html.erb
@@ -1,23 +1,14 @@
-
 <div class="container">
-
-<div class="button t-d">
-
-<%= link_to root_path do %>
- <i class="fa fa-bars" aria-hidden="true"></i>
-<% end %>
-
-</div>
-<%  @users.each do |user| %>
-
-<div class="card cd">
-  <div class="card-header usr">
-    Friend: <span> <%= user.name %> </span>
-   
+  <div class="button t-d">
+    <%= link_to root_path do %>
+      <i class="fa fa-bars" aria-hidden="true"></i>
+    <% end %>
   </div>
+  <%  @users.each do |user| %>
+    <div class="card cd">
+      <div class="card-header usr">
+        Friend: <span> <%= user.name %> </span>
+      </div>
+    </div>
+  <% end %>
 </div>
-
-  
-<% end %>
-
-</div>
\ No newline at end of file
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
index ba824e3..134dfea 100644
--- a/app/views/static_pages/home.html.erb
+++ b/app/views/static_pages/home.html.erb
@@ -1,40 +1,32 @@
 <div class="profile_page container">
-<div class="log_out_btn text-right">
-<%= link_to "Log Out", destroy_user_session_path, :class => "btn btn-danger", method: :delete %>
-</div>
-
-<section class="profile_image">
-  <div class="avator_image text-center">
-    <%= image_tag("avator.png", :alt => "avator") %>
+  <div class="log_out_btn text-right">
+    <%= link_to "Log Out", destroy_user_session_path, :class => "btn btn-danger", method: :delete %>
   </div>
-
-<div class="user_name text-center">
-<%= current_user.name %>
-</div> 
-</section>
-
-<section class="menu">
-<ul>
-
-<li>
-   <i class="fa fa-cog" aria-hidden="true"></i><%= link_to "All My transactions", transactions_path , :class => "btn" %>
-</li>
-<hr>
-<li>
- <i class="fa fa-map-marker" aria-hidden="true"></i> <%= link_to "All my External Transactions", external_path, :class => "btn" %>
-</li>
-<hr>
-<li>
-<i class="fa fa-plus-square" aria-hidden="true"></i> <%= link_to "All groups",  groups_path, :class => "btn" %>
-</li>
-
-<hr>
-<li>
-<i class="fa fa-plus-square" aria-hidden="true"></i> <%= link_to "friends",  friends_path, :class => "btn" %>
-</li>
-
-</ul>
-
-</section>
-
-</div>
\ No newline at end of file
+  <section class="profile_image">
+    <div class="avator_image text-center">
+      <%= image_tag("avator.png", :alt => "avator") %>
+    </div>
+    <div class="user_name text-center">
+      <%= current_user.name %>
+    </div>
+  </section>
+  <section class="menu">
+    <ul>
+      <li>
+        <i class="fa fa-cog" aria-hidden="true"></i><%= link_to "All My transactions", transactions_path , :class => "btn" %>
+      </li>
+      <hr>
+      <li>
+        <i class="fa fa-map-marker" aria-hidden="true"></i> <%= link_to "All my External Transactions", external_path, :class => "btn" %>
+      </li>
+      <hr>
+      <li>
+        <i class="fa fa-plus-square" aria-hidden="true"></i> <%= link_to "All groups",  groups_path, :class => "btn" %>
+      </li>
+      <hr>
+      <li>
+        <i class="fa fa-plus-square" aria-hidden="true"></i> <%= link_to "friends",  friends_path, :class => "btn" %>
+      </li>
+    </ul>
+  </section>
+</div>
diff --git a/app/views/transactions/_form.html.erb b/app/views/transactions/_form.html.erb
index 8f52a4f..88b7c73 100644
--- a/app/views/transactions/_form.html.erb
+++ b/app/views/transactions/_form.html.erb
@@ -1,32 +1,23 @@
 <%= form_for @transaction do |f| %>
-
-   <% if @transaction.errors.any? %>
-   <ul>
-   <% @transaction.errors.full_messages.each do |msg| %>
-       <li class="error"><%= msg %></li>
-   <% end %>
+  <% if @transaction.errors.any? %>
+    <ul>
+      <% @transaction.errors.full_messages.each do |msg| %>
+        <li class="error"><%= msg %></li>
+      <% end %>
     </ul>
-   <% end %>
-
- 
-    <%= f.label :name %><br />
-    <%= f.text_field :name %><br />
-
-    <%= f.label :amount %><br />
-    <%= f.number_field :amount %><br />
-
-     <div class="form-group">
-     <%= f.label 'Group' %>
+  <% end %>
+  <%= f.label :name %><br />
+  <%= f.text_field :name %><br />
+  <%= f.label :amount %><br />
+  <%= f.number_field :amount %><br />
+  <div class="form-group">
+    <%= f.label 'Group' %>
     <select id="transaction_group_id" name="transaction[group_id]" class="custom-select" id="inputGroupSelect01">
       <option value='<%= nil%>'>None</option>
-
       <% Group.all.each do |group| %>
         <option value="<%= group.id %>"><%= group.name %></option>
       <% end %>
-      
     </select>
-   </div>
-
-
-    <%= f.submit class: "submit text-center btn btn-primary" %>
-<% end %>
\ No newline at end of file
+  </div>
+  <%= f.submit class: "submit text-center btn btn-primary" %>
+<% end %>
diff --git a/app/views/transactions/edit.html.erb b/app/views/transactions/edit.html.erb
index df01289..910ddbd 100644
--- a/app/views/transactions/edit.html.erb
+++ b/app/views/transactions/edit.html.erb
@@ -1,4 +1,4 @@
 <div class="form_app container">
-<h2>edit transaction</h2>
-<%= render 'form', group: @transaction %>
-</div>
\ No newline at end of file
+  <h2>edit transaction</h2>
+  <%= render 'form', group: @transaction %>
+</div>
diff --git a/app/views/transactions/index.html.erb b/app/views/transactions/index.html.erb
index 2c9361d..923f9fd 100644
--- a/app/views/transactions/index.html.erb
+++ b/app/views/transactions/index.html.erb
@@ -1,67 +1,49 @@
 <section class="transaction_header">
-<div class="container t-d">
-<div class="button">
-<%= link_to root_path do %>
- <i class="fa fa-bars" aria-hidden="true"></i>
-<% end %>
-</div>
-<div class="title">
-Transactions
-</div>
-
-<div class="search">
-<i class="fa fa-search" aria-hidden="true"></i>
-</div>
-</div>
-
-<h3 class ="text-center">most recent</h3>
-
+  <div class="container t-d">
+    <div class="button">
+      <%= link_to root_path do %>
+        <i class="fa fa-bars" aria-hidden="true"></i>
+      <% end %>
+    </div>
+    <div class="title">
+      Transactions
+    </div>
+    <div class="search">
+      <i class="fa fa-search" aria-hidden="true"></i>
+    </div>
+  </div>
+  <h3 class ="text-center">most recent</h3>
 </section>
-
-<section class="transaction_body">  
-<div class="total_amount_sec">
-<div class="amount_title">
- total amount
-</div>
-
-<div class="actual_total_amount">
-  $ <%= @total %>
-</div>
-</div>
-<div class="container t-c">
-
-<% @other_transaction_sorted.each do |t| %>
- 
-<div class="card mb-3">
-  <div class="row no-gutters">
-    <div class="col-md-4 grp-icn">
-  
-       <i class= "<%= t.group.icon %>" ></i>
-     
+<section class="transaction_body">
+  <div class="total_amount_sec">
+    <div class="amount_title">
+      total amount
     </div>
-    <div class="col-md-8">
-      <div class="card-body">
-        <h5 class="card-title trns"> <%= t.name %> </h5>
-        <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
-        <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
-        
-        <%= link_to "edit", edit_transaction_path(t), :class => "btn btn-primary edit_btn" %>
-        
-        <%= link_to "delete", transaction_path(t), :class => "btn btn-danger delete_grp_btn", data: {confirm: "Are you sure?"}, :method => :delete %> 
-      </div>
+    <div class="actual_total_amount">
+      $ <%= @total %>
     </div>
   </div>
-</div>
-<% end %>
-</div>
-
-<br>
-
-
-<br>
-<%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
+  <div class="container t-c">
+    <% @other_transaction_sorted.each do |t| %>
+      <div class="card mb-3">
+        <div class="row no-gutters">
+          <div class="col-md-4 grp-icn">
+            <i class= "<%= t.group.icon %>" ></i>
+          </div>
+          <div class="col-md-8">
+            <div class="card-body">
+              <h5 class="card-title trns"> <%= t.name %> </h5>
+              <p class="card-text style-up"> <span>$</span> <%= t.amount %></p>
+              <p class="card-text"><small class="text-muted"><%= t.created_at %></small></p>
+              <%= link_to "edit", edit_transaction_path(t), :class => "btn btn-primary edit_btn" %>
+              <%= link_to "delete", transaction_path(t), :class => "btn btn-danger delete_grp_btn", data: {confirm: "Are you sure?"}, :method => :delete %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <br>
+  <br>
+  <%= link_to "Add new", new_transaction_path , :class => "btn btn-success  new_trans" %>
 </section>
-
-
-
-
diff --git a/app/views/transactions/new.html.erb b/app/views/transactions/new.html.erb
index 99c57a0..9e0680d 100644
--- a/app/views/transactions/new.html.erb
+++ b/app/views/transactions/new.html.erb
@@ -1,4 +1,4 @@
 <div class="form_app container">
-<h2>new transaction</h2>
-<%= render 'form', group: @transaction %>
-</div>
\ No newline at end of file
+  <h2>new transaction</h2>
+  <%= render 'form', group: @transaction %>
+</div>
diff --git a/bin/rails b/bin/rails
index 7a8ff81..3504c3f 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 begin
   load File.expand_path('spring', __dir__)
 rescue LoadError => e
diff --git a/bin/rake b/bin/rake
index 0ba8c48..1fe6cf0 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 begin
   load File.expand_path('spring', __dir__)
 rescue LoadError => e
diff --git a/bin/setup b/bin/setup
index 5853b5e..ac9f624 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'fileutils'
 
 # path to your application root.
diff --git a/bin/spring b/bin/spring
index d89ee49..1c6eabf 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # This file loads Spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4d82ff6..ef17cb8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,13 +1,13 @@
 Rails.application.configure do
   config.after_initialize do
-      Bullet.enable        = true
-      Bullet.alert         = true
-      Bullet.bullet_logger = true
-      Bullet.console       = true
+    Bullet.enable = true
+    Bullet.alert         = true
+    Bullet.bullet_logger = true
+    Bullet.console       = true
     # Bullet.growl         = true
-      Bullet.rails_logger  = true
-      Bullet.add_footer    = true
-    end  # Settings specified here will take precedence over those in config/application.rb.
+    Bullet.rails_logger  = true
+    Bullet.add_footer    = true
+  end # Settings specified here will take precedence over those in config/application.rb.
 
   # devise configuration
   config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
diff --git a/db/migrate/20200622082541_add_column_group_id_to_transactions.rb b/db/migrate/20200622082541_add_column_group_id_to_transactions.rb
index efa3e81..6634492 100644
--- a/db/migrate/20200622082541_add_column_group_id_to_transactions.rb
+++ b/db/migrate/20200622082541_add_column_group_id_to_transactions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddColumnGroupIdToTransactions < ActiveRecord::Migration[6.0]
   def change
     add_column :transactions, :group_id, :integer
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 16dfffa..a8463d1 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1,24 +1,26 @@
+# rubocop:disable Lint/UselessAssignment
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Group, type: :model do
+  test_user = User.create!(name: 'peter robert', email: 'b@example.com', password: 'hsjoarty067')
+  test_group = Group.create!(name: 'test_group', icon: 'https://testicons.com/testicon.png', user_id: test_user.id)
+
+  it 'should fail to create a group without name' do
+    ev = Group.create(icon: 'https://testicons.com/testicon.png')
+    expect(ev.persisted?).to eql(false)
+  end
 
-        test_user = User.create!(name: 'peter robert', email: 'b@example.com', password: 'hsjoarty067')
-        test_group = Group.create!(name: 'test_group', icon: 'https://testicons.com/testicon.png', user_id:test_user.id)
-       
+  it 'should fail to create a group user' do
+    ev = Group.create(name: 'test_group', icon: 'https://testicons.com/testicon.png')
+    expect(ev.persisted?).to eql(false)
+  end
 
-      it 'should fail to create a group without name' do
-        ev = Group.create(icon: 'https://testicons.com/testicon.png')
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should create group' do
+    ev = Group.create(name: 'test_group', icon: 'https://testicons.com/testicon.png', user_id: test_user.id)
+    expect(ev.persisted?).to eql(true)
+  end
+end
 
-      it 'should fail to create a group user' do
-        ev = Group.create(name: 'test_group',icon: 'https://testicons.com/testicon.png')
-        expect(ev.persisted?).to eql(false)
-      end
-     
-      it 'should create group' do
-        ev = Group.create(name: 'test_group',icon: 'https://testicons.com/testicon.png', user_id:test_user.id)
-        expect(ev.persisted?).to eql(true)
-      end
-      
-end
\ No newline at end of file
+# rubocop:enable Lint/UselessAssignment
diff --git a/spec/models/transaction_spec.rb b/spec/models/transaction_spec.rb
index 4594f6e..0da11c8 100644
--- a/spec/models/transaction_spec.rb
+++ b/spec/models/transaction_spec.rb
@@ -1,31 +1,33 @@
+# rubocop:disable Style/FrozenStringLiteralComment
+# rubocop:disable Lint/UselessAssignment
+
 require 'rails_helper'
 
 RSpec.describe Transaction, type: :model do
+  test_user = User.create!(name: 'peter robert', email: 'pan@example.com', password: 'hsjoarty067')
+  test_group = test_user.groups.create!(name: 'test_group', icon: 'https://testicons.com/testicon.png')
+  test_transaction = Transaction.create!(name: 'test_transaction', amount: 100, user_id: test_user.id, group_id: test_group.id)
 
-        test_user = User.create!(name: 'peter robert', email: 'pan@example.com', password: 'hsjoarty067')
-        test_group = test_user.groups.create!(name: 'test_group', icon: 'https://testicons.com/testicon.png')
-        test_transaction = Transaction.create!(name: 'test_transaction', amount: 100, user_id:  test_user.id, group_id: test_group.id)
-    
-
-      it 'should fail to create a transaction without amount' do
-        ev = Transaction.create(name: 'test event')
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should fail to create a transaction without amount' do
+    ev = Transaction.create(name: 'test event')
+    expect(ev.persisted?).to eql(false)
+  end
 
-      it 'should fail to create a transaction without name' do
-        ev = Transaction.create(amount: 200)
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should fail to create a transaction without name' do
+    ev = Transaction.create(amount: 200)
+    expect(ev.persisted?).to eql(false)
+  end
 
-      it 'should fail to create a transaction without user' do
-        ev = Transaction.create(name: 'test event', amount: 100, group_id: test_group.id )
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should fail to create a transaction without user' do
+    ev = Transaction.create(name: 'test event', amount: 100, group_id: test_group.id)
+    expect(ev.persisted?).to eql(false)
+  end
 
-      it 'should be saved with all users' do
-        ev = Transaction.create(name: 'test event', amount: 100, user_id:  test_user.id, group_id: test_group.id )
-        expect(ev.persisted?).to eql(true)
-      end
+  it 'should be saved with all users' do
+    ev = Transaction.create(name: 'test event', amount: 100, user_id: test_user.id, group_id: test_group.id)
+    expect(ev.persisted?).to eql(true)
+  end
+end
 
-      
-end
\ No newline at end of file
+# rubocop:enable Style/FrozenStringLiteralComment
+# rubocop:enable Lint/UselessAssignment
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 43b101c..791b9db 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,24 +1,26 @@
+# rubocop:disable Style/FrozenStringLiteralComment
+# rubocop:disable Lint/UselessAssignment
+
 require 'rails_helper'
 
 RSpec.describe User, type: :model do
+  test_user = User.create!(name: 'peter robert', email: 'h@example.com', password: 'hsjoarty067')
 
-        test_user = User.create!(name: 'peter robert', email: 'h@example.com', password: 'hsjoarty067')
-
-      it 'should fail to create account without name' do
-        ev = User.create(email: 'b@example.com', password: 'hsjoarty067')
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should fail to create account without name' do
+    ev = User.create(email: 'b@example.com', password: 'hsjoarty067')
+    expect(ev.persisted?).to eql(false)
+  end
 
-      it 'should fail to create account without email' do
-        ev = User.create(name: 'peter robert', password: 'hsjoarty067')
-        expect(ev.persisted?).to eql(false)
-      end
-     
-      it 'should fail to create account without password' do
-        ev = User.create(name: 'peter robert', email: 'e@example.com')
-        expect(ev.persisted?).to eql(false)
-      end
+  it 'should fail to create account without email' do
+    ev = User.create(name: 'peter robert', password: 'hsjoarty067')
+    expect(ev.persisted?).to eql(false)
+  end
 
+  it 'should fail to create account without password' do
+    ev = User.create(name: 'peter robert', email: 'e@example.com')
+    expect(ev.persisted?).to eql(false)
+  end
+end
 
-      
-end
\ No newline at end of file
+# rubocop:enable Style/FrozenStringLiteralComment
+# rubocop:enable Lint/UselessAssignment
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 00345af..7f6f773 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,9 +1,11 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
+# frozen_string_literal: true
+
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../config/environment', __dir__)
 # Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
+abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ce33d66..15a3872 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -44,53 +44,51 @@
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  config.disable_monkey_patching!
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = "doc"
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 end
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 79e6011..eaddb46 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -1,17 +1,21 @@
+# rubocop:disable Style/FrozenStringLiteralComment
+
 RSpec.configure do |config|
-    config.before(:suite) do
-      DatabaseCleaner.clean_with :truncation, except: %w[ar_internal_metadata]
-    end
-  
-    config.before(:each) do
-      DatabaseCleaner.strategy = :transaction
-    end
-  
-    config.before(:each) do
-      DatabaseCleaner.start
-    end
-  
-    config.after(:each) do
-      DatabaseCleaner.clean
-    end
-  end
\ No newline at end of file
+  config.before(:suite) do
+    DatabaseCleaner.clean_with :truncation, except: %w[ar_internal_metadata]
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end
+
+# rubocop:enable Style/FrozenStringLiteralComment
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 23701b4..652febb 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb
index d05dbd2..c293805 100644
--- a/test/channels/application_cable/connection_test.rb
+++ b/test/channels/application_cable/connection_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase
diff --git a/test/controllers/groups_controller_test.rb b/test/controllers/groups_controller_test.rb
index 23aba76..5ab1617 100644
--- a/test/controllers/groups_controller_test.rb
+++ b/test/controllers/groups_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class GroupsControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/controllers/static_pages_controller_test.rb b/test/controllers/static_pages_controller_test.rb
index 76b4b38..ce5cdc2 100644
--- a/test/controllers/static_pages_controller_test.rb
+++ b/test/controllers/static_pages_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class StaticPagesControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/controllers/transactions_controller_test.rb b/test/controllers/transactions_controller_test.rb
index a4189f0..751e4c9 100644
--- a/test/controllers/transactions_controller_test.rb
+++ b/test/controllers/transactions_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TransactionsControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/models/group_test.rb b/test/models/group_test.rb
index 778eb0c..ae91507 100644
--- a/test/models/group_test.rb
+++ b/test/models/group_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class GroupTest < ActiveSupport::TestCase
diff --git a/test/models/transaction_test.rb b/test/models/transaction_test.rb
index f2b87fe..9ec6f03 100644
--- a/test/models/transaction_test.rb
+++ b/test/models/transaction_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TransactionTest < ActiveSupport::TestCase
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 82f61e0..5cc44ed 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d5300f8..8aad663 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 require 'rails/test_help'