Fix error when on preferences page
Small performance optimizations and code cleanup
Update CHANGELOG.md