Refactors the tabs control
Updates README after refactor tabs control