fixes 3
Merge remote-tracking branch 'origin/master'
fixes
TODO: searchbar in settings noch umfärben
Merge remote-tracking branch 'origin/master'
style angepasst