diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b6fb6b1..3f33b5f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,12 +22,16 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Restore cargo cache
+      if: matrix.os != 'macos-latest'
       uses: actions/cache@v2
       env:
-        cache-name: cache-cargo-crates
+        cache-name: ci
       with:
-        path: ~/.cargo
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.rust }}-${{ hashFiles('Cargo.lock') }}
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ matrix.os }}-${{ env.cache-name }}-${{ matrix.rust }}-${{ hashFiles('Cargo.lock') }}
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
@@ -39,7 +43,6 @@ jobs:
 
     - name: Build Debug
       run: |
-        rustc --version
         cargo build
 
     - name: Run tests
@@ -119,4 +122,4 @@ jobs:
     - uses: actions/upload-artifact@v1
       with:
         name: release-notes.txt
-        path: ./release-notes.txt
+        path: ./release-notes.txt
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index d917bd38..ef709fb5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ unicode-width = "0.1"
 textwrap = "0.12"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-which = "4.0.2"
+which = "4.0"
 
 [target.'cfg(not(windows))'.dependencies]
 pprof = { version = "0.3", features = ["flamegraph"], optional = true }
diff --git a/README.md b/README.md
index 3af8d183..126929d5 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ For a [RustBerlin meetup presentation](https://youtu.be/rpilJV-eIVw?t=5334) ([sl
 
 I do most of my git usage in a terminal but I frequently found myself using git UIs for some use cases like: index, commit, diff, stash and log.
 
-Over the last 2 years my go-to GUI tool for this was [fork](https://git-fork.com) because it was snappy, free, and not bloated. Unfortunately the _free_ part will [change soon](https://github.com/ForkIssues/TrackerWin/issues/571) and so I decided to build a fast and simple terminal tool myself to help do features I use the most.
+Over the last 2 years my go-to GUI tool for this was [fork](https://git-fork.com) because it was snappy, free, and not bloated. Unfortunately the _free_ part will [change soon](https://github.com/ForkIssues/TrackerWin/issues/571) and so I decided to build a fast and simple terminal tool to help with features I use the most.
 
 # Known Limitations
 
diff --git a/src/components/mod.rs b/src/components/mod.rs
index aa73b686..6714f311 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -20,9 +20,6 @@ mod tag_commit;
 mod textinput;
 mod utils;
 
-use anyhow::Result;
-use crossterm::event::Event;
-
 pub use changes::ChangesComponent;
 pub use command::{CommandInfo, CommandText};
 pub use commit::CommitComponent;
@@ -45,6 +42,8 @@ pub use textinput::{InputType, TextInputComponent};
 pub use utils::filetree::FileTreeItemKind;
 
 use crate::ui::style::Theme;
+use anyhow::Result;
+use crossterm::event::Event;
 use tui::{
     backend::Backend,
     layout::{Alignment, Rect},