Fix autocmd outside of if statement
Remove manual width calculation and handle horizontal scroll