Modified right panel elements
Added circle and rect tools