diff --git a/.tmux.conf b/.tmux.conf
index bf783b6b..43bd2f2f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,6 +3,8 @@ set -g default-terminal "xterm-256color"
 set-option -sa terminal-overrides ",xterm-256color:RGB"
 
 set-option -sg escape-time 10
+set -g base-index 1
+setw -g pane-base-index 1
 
 set -s escape-time 0
 
@@ -26,7 +28,29 @@ bind -r h resize-pane -L 5
 
 bind -r m resize-pane -Z
 
+unbind c
+bind c new-window -c "#{pane_current_path}"
+
+unbind b
+bind b display-popup -w 80% -h 80% -E "tmux new-session -A -s FloatingSession-$(tmux display-message -p '#S')"
+
+# -------------------------------
+# Copy and Paste Options
+# -------------------------------
 set -g mouse on
+set-option -g mouse on
+set -g mode-keys vi
+set-option -s set-clipboard off
+
+bind P paste-buffer
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X rectangle-toggle
+
+unbind -T copy-mode-vi Enter
+bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+
+# -------------------------------
 
 set -g @plugin 'tmux-plugins/tpm'
 
diff --git a/lazygit/config.yml b/lazygit/config.yml
index da676edb..983f6330 100644
--- a/lazygit/config.yml
+++ b/lazygit/config.yml
@@ -1,4 +1,8 @@
 git:
+  allBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium --oneline"
+  autoFetch: true
+  autoRefresh: true
+  branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium --oneline {{branchName}} --"
   paging:
     colorArg: always
     pager: diff-so-fancy