Add dynamic tab instead of subpages; Remove unnecessary code