Adding smart-mode-line, some refinements