Modify feedback, fix some tests
add the sortng for admin UI