Added context menu options
Added draw rectangle and ellipse