:smile:  updated the PR with the tabs layout.