Bugfixes:
- Fixed display errors
- Fixed crashes