Wrap dynamic text in classes
refactor and implement updating of all dynamic text