fixed sorting on mobile
merge conflicts
fix heroku merge conflicts