diff --git a/spacemacs b/spacemacs
index 6255014..16b55e2 100644
--- a/spacemacs
+++ b/spacemacs
@@ -25,8 +25,10 @@
           ;; External tool integration
           version-control
           git
-          (shell :variables
-                 shell-default-term-shell "/usr/local/bin/fish")
+          shell
+          ;; (shell :variables
+          ;;        shell-default-term-shell "/usr/local/bin/fish"
+          ;;        shell-default-height 30)
 
           ;; Editing
           auto-completion
@@ -173,6 +175,8 @@ before layers configuration."
    ;; Ruby version manager
    ruby-version-manager 'rbenv
    ruby-enable-ruby-on-rails-support t
+   ;; Auto-resume layouts on relaunch
+   dotspacemacs-auto-resume-layouts t
    )
   ;; User initialization goes here
   (add-to-list 'default-frame-alist '(height . 60))
@@ -195,6 +199,7 @@ layers configuration."
   (setq tab-width 2)
   (setq c-basic-offset 2)
   (setq indent-tabs-mode nil)
+  (setq-default spacemacs-show-trailing-whitespace nil)
 )
 
 ;; Do not write anything past this comment. This is where Emacs will