Modal Tab rework