Removed split, other small changes to work with tmux