Bugfixes:
- Fixed display errors