Going to a more standard vi layout