- Filter fixed text and inconsistencies
- Settings layout improved
Merge origin/master