final touches on user/organization views