adjustment on sorting logic, cleaned up view