Implement major structural change to improve multiple instances of TB in single page