some changes to accomodate tool views