Make tabs a bit better
Add renaming support