Tab controller added
Refactor