Added to form - renamed controller
Added circle controller
Added triangle controller
Finished