diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 87cde23..04f99d1 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,5 +1,9 @@
-nnoremap ,t <S-V>:t.<Bar>s/./=/g<Bar>t-2<CR>:noh<CR> 
-nnoremap ,1 <S-V>:t.<Bar>s/./=/g<CR>:noh<CR> 
-nnoremap ,2 <S-V>:t.<Bar>s/./*/g<CR>:noh<CR> 
-nnoremap ,3 <S-V>:t.<Bar>s/./+/g<CR>:noh<CR> 
-nnoremap ,4 <S-V>:t.<Bar>s/./-/g<CR>:noh<CR> 
+" Wrap lines at 80 characters
+setlocal textwidth=79
+
+" Title and heading key mappings
+inoremap ,t <ESC><S-V>:t.<Bar>s/./=/g<Bar>t-2<CR>:noh<CR>j2A
+inoremap ,1 <ESC><S-V>:t.<Bar>s/./=/g<CR>:noh<CR>A
+inoremap ,2 <ESC><S-V>:t.<Bar>s/./*/g<CR>:noh<CR>A
+inoremap ,3 <ESC><S-V>:t.<Bar>s/./+/g<CR>:noh<CR>A
+inoremap ,4 <ESC><S-V>:t.<Bar>s/./-/g<CR>:noh<CR>A