some changes to viewset and editset activity