combined collaborator with user, adjusted views and displays, cleaned up forms