Cleanup tabs module
Fix cannot close tabs issue