Remove yellow (lack of contrast)
Move sorting view to separate file
Small changes/fixes