proper order of insert and remove tab bar
tweak naming