Completed the old Styling.
Merge branch 'feature/filters'