Added rect and circle drawind tools