modified user and admin views added implicit sorting