fix some ordering in admin and views